Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/dao/PurchaseAcceptItemDao.java

@@ -39,7 +39,7 @@ public interface PurchaseAcceptItemDao extends JpaSpecificationExecutor<Purchase
 	 * @param needEndDate
 	 * @return
 	 */
-	@Query("from PurchaseAcceptItem p where p.accept.vendUU = :enUU and p.orderItem.order.date >= :startDate and p.orderItem.order.date <= :endDate")
+	@Query("from PurchaseAcceptItem p where p.accept.vendUU = :enUU and p.orderItem.order.date >= :startDate and p.orderItem.order.date <= :endDate and p.orderItem.order.currency = 'RMB'")
 	List<PurchaseAcceptItem> findPurcAccsptItems(@Param("enUU") Long enUU, @Param("startDate") Date needStartDate, @Param("endDate") Date needEndDate);
 
 	/**

src/main/java/com/uas/platform/b2b/openapi/model/FxPurOrder.java

@@ -105,7 +105,11 @@ public class FxPurOrder {
             this.custName = order.getEnterprise().getEnName();
         }
         this.custUU = order.getEnUU();
-        this.total = orderItem.getAmount();
+        if (StringUtils.isEmpty(orderItem.getQty()) || StringUtils.isEmpty(orderItem.getPrice())) {
+            this.total =  0d;
+        } else {
+            this.total = orderItem.getQty()*orderItem.getPrice();
+        }
         this.date = order.getDate();
         this.orderItems.add(new FxPurcOrderItem(orderItem,needAcceptItem));
     }

src/main/java/com/uas/platform/b2b/openapi/model/FxPurcAcceptItem.java

@@ -120,7 +120,11 @@ public class FxPurcAcceptItem {
         this.acceptCode = acceptItem.getAccept().getCode();
         this.acceptDate = acceptItem.getAccept().getDate();
         this.acceptQty = acceptItem.getQty();
-        this.acceptAmount = acceptItem.getQty()*acceptItem.getOrderPrice();
+        if (!StringUtils.isEmpty(acceptItem.getQty()) && !StringUtils.isEmpty(acceptItem.getOrderPrice())) {
+            this.acceptAmount = acceptItem.getQty()*acceptItem.getOrderPrice() ;
+        } else {
+            this.acceptAmount = 0d;
+        }
         this.detno = acceptItem.getNumber();
         if (!StringUtils.isEmpty(acceptItem.getCheckQty())) {
             this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
@@ -134,7 +138,11 @@ public class FxPurcAcceptItem {
         this.acceptCode = acceptItem.getAccept().getCode();
         this.acceptDate = acceptItem.getAccept().getDate();
         this.acceptQty = acceptItem.getQty();
-        this.acceptAmount = acceptItem.getQty()*acceptItem.getOrderPrice();
+        if (!StringUtils.isEmpty(acceptItem.getQty()) && !StringUtils.isEmpty(acceptItem.getOrderPrice())) {
+            this.acceptAmount = acceptItem.getQty()*acceptItem.getOrderPrice() ;
+        } else {
+            this.acceptAmount = 0d;
+        }
         this.detno = acceptItem.getNumber();
         if (!StringUtils.isEmpty(acceptItem.getCheckQty())) {
             this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";

src/main/java/com/uas/platform/b2b/openapi/model/FxPurcOrderItem.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.openapi.model;
 import com.uas.platform.b2b.model.PurchaseAcceptItem;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
+import org.springframework.util.StringUtils;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -159,7 +160,11 @@ public class FxPurcOrderItem {
         this.productCmpcode = orderItem.getProductCmpCode();
         this.detno = orderItem.getNumber();
         this.qty = orderItem.getQty();
-        this.order = new FxPurOrder().convert(order,orderItem.getAmount());
+        Double orderTotal = 0d;
+        if (!StringUtils.isEmpty(orderItem.getQty()) && !StringUtils.isEmpty(orderItem.getPrice())) {
+            orderTotal = orderItem.getQty()*orderItem.getPrice();
+        }
+        this.order = new FxPurOrder().convert(order,orderTotal);
         return this;
     }
 }

src/main/java/com/uas/platform/b2b/openapi/service/impl/UsoftFxServiceImpl.java

@@ -45,34 +45,45 @@ public class UsoftFxServiceImpl implements UsoftFxService{
                 }
             }
         }
+        // 数据转换为指定格式
         List<FxPurOrder> fxPurOrders = new ArrayList<>();
         List<PurchaseOrderItem> orderItems = new ArrayList<>();
         for (PurchaseAcceptItem needAcceptItem : acceptItems) {
             if (!StringUtils.isEmpty(needAcceptItem.getOrderItem())) {
                 PurchaseOrderItem orderItem = needAcceptItem.getOrderItem();
                 PurchaseOrder order = orderItem.getOrder();
+                // 判断fxPurOrders是否存在该订单
                 boolean exit = false;
                 for (FxPurOrder fxPurOrder : fxPurOrders) {
                     if (order.getId().equals(fxPurOrder.getId())) {
                         exit = true;
                     }
                 }
+                // 判断fxPurOrders.orderItems是否存在该订单明细
                 boolean exitOrderItem = false;
                 for (PurchaseOrderItem orderItem1 : orderItems) {
-                    if (orderItem1.getId().equals(orderItem1.getId())) {
+                    if (orderItem.getId().equals(orderItem1.getId())) {
                         exitOrderItem =true;
                     }
                 }
                 orderItems.add(orderItem);
+                // 不存在该订单，则新增
                 if (!exit) {
                     fxPurOrders.add(new FxPurOrder(order,orderItem,needAcceptItem));
                 } else {
+                    // 存在则找出该订单
                     for (FxPurOrder fxPurOrder : fxPurOrders) {
                         if (order.getId().equals(fxPurOrder.getId())) {
+                            // 不存在该明细，新增
                             if (!exitOrderItem) {
-                                fxPurOrder.setTotal(fxPurOrder.getTotal()+orderItem.getAmount());
+                                Double orderItemAmout = 0d ;
+                                if (!StringUtils.isEmpty(orderItem.getQty()) && !StringUtils.isEmpty(orderItem.getPrice())) {
+                                    orderItemAmout = orderItem.getQty()*orderItem.getPrice();
+                                }
+                                fxPurOrder.setTotal(fxPurOrder.getTotal() + orderItemAmout);
                                 fxPurOrder.getOrderItems().add(new FxPurcOrderItem(orderItem,needAcceptItem));
                             } else {
+                                // 存在该明细，找出并把验收明细插入到该明细
                                 for (FxPurcOrderItem fxPurcOrderItem :fxPurOrder.getOrderItems()) {
                                     if (fxPurcOrderItem.getId().equals(orderItem.getId())) {
                                         fxPurcOrderItem.getAcceptItems().add(new FxPurcAcceptItem(needAcceptItem));

src/main/resources/txcloud/jdbc.properties

@@ -28,5 +28,5 @@ manage.jdbc.password=select!#%*(
 
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://172.21.0.2:3306/b2b_prod?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
-jdbc.username=sa
+jdbc.username=root
 jdbc.password=select111***

src/main/resources/txcloud/sys.properties

@@ -7,8 +7,8 @@ b2c=https://www.usoftmall.com
 registerUrl=https://sso.ubtob.com/register/enterpriseRegistration
 
 #report url
-reportPrintUrl=http://pre-print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
-reportUploadUrl=http://pre-print.ubtob.com/report/fileUpload?userName=B2B%s
+reportPrintUrl=https://print.usoftchina.com/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
+reportUploadUrl=https://print.usoftchina.com/fileUpload?userName=B2B%s
 
 #product service url
 productServiceUrl=http://172.21.0.47:8080
@@ -20,4 +20,4 @@ inquiryServiceUrl=https://api-inquiry.usoftchina.com/
 messageServiceIp=http://message.ubtob.com/
 
 #search url
-searchUrl=http://172.21.0.48:8081
+searchUrl=http://172.21.0.6:8081