Merge branch 'master' of cy/ccnet2.0 into master

src/main/java/com/emato/ccnet/mapper/ccnet/CusWaybillMapper.java

@@ -20,10 +20,10 @@ public interface CusWaybillMapper {
 
     /**
      * 批量插入海关运单
-     * @param cusWaybills
+     * @param list
      * @return
      */
-    int insertCusWaybillItemBatch(List<CusWaybill> cusWaybills);
+    int insertCusWaybillItemBatch(List<CusWaybill> list);
 
     /**
      * 查找海关运单

src/main/java/com/emato/ccnet/service/ccent/impl/CusOrderImpl.java

@@ -74,33 +74,32 @@ public class CusOrderImpl implements CusOrderService{
         List<String> orderList = new ArrayList<>();
         for (OrderBill orderBill : orderBillList) {
             CusOrder bill = cusOrderMapper.findCusOrderByOrderNo(orderBill.getOrderNo());
-            if(bill == null){
-                String cusOrderSn = Contants.ZWSH + SnowflakeUtil.getSnowNextId();
-                String orderSn = Contants.ZW +SnowflakeUtil.getSnowNextId();
-                //电子订单表
-                CusOrder cusOrder = buildCusOrder(orderBill,cusOrderSn,orderSn);
-                CusOrders.add(cusOrder);
-
-                //插入电子订单商品表
-                buildCusOrderGoods(orderBill,cusOrderSn);
-
-                //电子订单发送状态
-                CusOrderStatus cusOrderStatus = buildCusOrderStatus(orderBill,cusOrderSn,orderSn);
-                CusOrderStatues.add(cusOrderStatus);
-            }
+            String cusOrderSn = Contants.ZWSH + SnowflakeUtil.getSnowNextId();
+            String orderSn = Contants.ZW +SnowflakeUtil.getSnowNextId();
+            //电子订单表
+            CusOrder cusOrder = buildCusOrder(orderBill,cusOrderSn,orderSn);
+            CusOrders.add(cusOrder);
 
-        }
+            //插入电子订单商品表
+            buildCusOrderGoods(orderBill,cusOrderSn);
+
+            //电子订单发送状态
+            CusOrderStatus cusOrderStatus = buildCusOrderStatus(orderBill,cusOrderSn,orderSn);
+            CusOrderStatues.add(cusOrderStatus);
 
+        }
         if (cusOrderMapper.insertCusOrderItemBatch(CusOrders) <= 0) {
             logger.error("批量插入，电子订单表记录全部失败");
             return 0;
         }
 
+
         if(cusOrderStatusMapper.insertCusOrderStatusItemBatch(CusOrderStatues) <= 0){
             logger.error("批量插入，电子订单状态表记录全部失败");
             return 0;
         }
 
+
         return 1;
     }
 

src/main/java/com/emato/ccnet/service/ccent/impl/CusWaybillImpl.java

@@ -58,19 +58,17 @@ public class CusWaybillImpl implements CusWaybillService{
 
         for(WayBill wayBill:wayBillList){
             CusWaybill waybill = cusWaybillMapper.findCusWaybillByOrderNo(wayBill.getOrderNo());
-            if(waybill == null){
-                String cusWaybillSn = Contants.ZWSH + SnowflakeUtil.getSnowNextId();
-                //海关运单
-                CusWaybill cusWaybill = buildCusWaybill(wayBill,cusWaybillSn);
-                cusWaybills.add(cusWaybill);
+            String cusWaybillSn = Contants.ZWSH + SnowflakeUtil.getSnowNextId();
+            //海关运单
+            CusWaybill cusWaybill = buildCusWaybill(wayBill,cusWaybillSn);
+            cusWaybills.add(cusWaybill);
 
-                //海关运单商品
-                buildCusWaybillGoods(wayBill,cusWaybillSn);
+            //海关运单商品
+            buildCusWaybillGoods(wayBill,cusWaybillSn);
 
-                //海关运单状态
-                CusWaybillStatus cusWaybillStatus = buildCusWaybillStatus(wayBill,cusWaybillSn);
-                cusWaybillStatues.add(cusWaybillStatus);
-            }
+            //海关运单状态
+            CusWaybillStatus cusWaybillStatus = buildCusWaybillStatus(wayBill,cusWaybillSn);
+            cusWaybillStatues.add(cusWaybillStatus);
 
         }
 
@@ -81,12 +79,14 @@ public class CusWaybillImpl implements CusWaybillService{
             return 0;
         }
 
+
         //批量插入海关运单状态
         if(cusWaybillStatusMapper.insertCusWaybillStatusItemBatch(cusWaybillStatues)  <= 0){
             logger.error("批量插入，海关运单状态记录全部失败");
             return 0;
         }
 
+
         return 1;
     }