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

src/main/java/com/emato/ccnet/biz/req/order/csp/Ceb311OrderBiz.java

@@ -49,7 +49,7 @@ public class Ceb311OrderBiz implements CebReqBiz {
         //查询中网电子订单数据
         List list = ceb311OrderGetDate.getData(reqParam);
         if (list.isEmpty()) {
-            String info = "【CEB411】没有订单数据, 生成海关支付单报文提前结束";
+            String info = "【CEB311】没有订单数据, 生成海关支付单报文提前结束";
             LOGGER.error("--- {}", info);
             return ResponseMessage.failed(info);
         }

src/main/java/com/emato/ccnet/biz/req/order/csp/Ceb311SendDateRequet.java

@@ -136,8 +136,8 @@ public class Ceb311SendDateRequet implements CebReqSendDate {
             sucList.add(cusOrder.getOrderSn());
         }
 
-        LOGGER.info("--- 【CEB411】【成功】订单数:{}, 订单: {}", sucList.size(), Joiner.on(",").skipNulls().join(sucList.toArray()));
-        LOGGER.info("--- 【CEB411】【失败】订单数:{}, 订单: {}", failedList.size(), Joiner.on(",").skipNulls().join(failedList.toArray()));
+        LOGGER.info("--- 【CEB311】【成功】订单数:{}, 订单: {}", sucList.size(), Joiner.on(",").skipNulls().join(sucList.toArray()));
+        LOGGER.info("--- 【CEB311】【失败】订单数:{}, 订单: {}", failedList.size(), Joiner.on(",").skipNulls().join(failedList.toArray()));
 
         ceb311SendDateAfter.afterSend(sucList,failedList);
 
@@ -155,7 +155,7 @@ public class Ceb311SendDateRequet implements CebReqSendDate {
         //构建Request
         String url = cus.getOrder().get("order-url");
         Request request = OkHttpUtil.buildRequest(url,requestBody);
-        LOGGER.info("oms的请求报文：" + request);
+
         // 同步访问,返回结果字符串
         String response = null;
         try {
@@ -236,7 +236,7 @@ public class Ceb311SendDateRequet implements CebReqSendDate {
         request.setClsOrderDto(clsOrderDto);
         String cusOrderGoodesJson = JacksonUtil.toJson(request);
         sPara.put("data", cusOrderGoodesJson);
-
+        LOGGER.info("request Data :" + cusOrderGoodesJson);
         return sPara;
     }
 

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

@@ -23,6 +23,7 @@ public interface CusOrderMapper {
      */
     int insertCusOrderItemBatch(List<CusOrder> cusOrders);
 
+
     /**
      * 查找ccnet中的表的数据
      * @return

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

@@ -32,5 +32,5 @@ public interface CusWaybillMapper {
     List<CusWaybill> findAllCusWaybill();
 
 
-
+    CusWaybill findCusWaybillByOrderNo(String orderNo);
 }

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

@@ -70,20 +70,25 @@ public class CusOrderImpl implements CusOrderService{
 
         //支付单数据
         List<OrderBill> orderBillList = (List<OrderBill>) list;
+
+        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);
 
-            String cusOrderSn = Contants.ZWSH + SnowflakeUtil.getSnowNextId();
-            String orderSn = Contants.ZW +SnowflakeUtil.getSnowNextId();
-            //电子订单表
-            CusOrder cusOrder = buildCusOrder(orderBill,cusOrderSn,orderSn);
-            CusOrders.add(cusOrder);
+                //插入电子订单商品表
+                buildCusOrderGoods(orderBill,cusOrderSn);
 
-            //插入电子订单商品表
-            buildCusOrderGoods(orderBill,cusOrderSn);
+                //电子订单发送状态
+                CusOrderStatus cusOrderStatus = buildCusOrderStatus(orderBill,cusOrderSn,orderSn);
+                CusOrderStatues.add(cusOrderStatus);
+            }
 
-            //电子订单发送状态
-            CusOrderStatus cusOrderStatus = buildCusOrderStatus(orderBill,cusOrderSn,orderSn);
-            CusOrderStatues.add(cusOrderStatus);
         }
 
         if (cusOrderMapper.insertCusOrderItemBatch(CusOrders) <= 0) {

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

@@ -56,17 +56,21 @@ public class CusWaybillImpl implements CusWaybillService{
         List<WayBill> wayBillList = (List<WayBill>) list;
 
         for(WayBill wayBill:wayBillList){
-            String cusWaybillSn = Contants.ZWSH + SnowflakeUtil.getSnowNextId();
-            //海关运单
-            CusWaybill cusWaybill = buildCusWaybill(wayBill,cusWaybillSn);
-            cusWaybills.add(cusWaybill);
+            CusWaybill waybill = cusWaybillMapper.findCusWaybillByOrderNo(wayBill.getOrderNo());
+            if(waybill == null){
+                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);
         }
 
         //批量插入海关运单

src/main/resources/application.yml

@@ -59,9 +59,9 @@ spring:
       # 数据源zaxxer HikariCP
       type: com.zaxxer.hikari.HikariDataSource
       driver-class-name: org.mariadb.jdbc.Driver
-      url: jdbc:mysql://61.144.244.114:3306/shop_erp?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-      username: emouhi
-      password: EmouH&v3
+      url: jdbc:mysql://183.3.221.144:3306/shop_erp?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: user
+      password: abc-123Bf
       # hikari连接池配置
       hikari:
         read-only: false

src/main/resources/mybatis/mapper/ccnet/cus_waybill.xml

@@ -567,4 +567,16 @@
     ORDER by cw.cus_waybill_sn
   </select>
 
+  <select id="findCusWaybillByOrderNo" parameterType="com.emato.ccnet.domain.ccnet.CusWaybill" resultMap="BaseResultMap">
+    select cus_waybill_sn, merch_order_sn, merch_sn, merch_name, plat_sn, plat_name, third_party_merch_code, third_party_merch_name,
+      place_orderl_time, auto_send, buyer_bill_time, buyer_id_type, buyer_id_code, buyer_name, buyer_mob, buyer_tel, consignee_id_type,
+      consignee_id_code, consignee_name, consignee_mob, consignee_tel, consignee_country_code, consignee_province_code,
+      consignee_province, consignee_city_code, consignee_city, consignee_district_code, consignee_district,
+      consignee_address, consignee_zip_code, payer_name, payer_id_type, payer_id_code, payer_mob,
+      payer_tel, pay_ent_cus_code, pay_no, actural_paid, pay_time, expr_fee,
+      insured_fee, post_tax, currency_code, buyer_remark, creater_sn, create_time,
+      moder_sn, mod_time, tstm, ex_field, ex_field2, ex_field3, ex_field4, ex_field5
+    from cus_waybill
+    where merch_order_sn = #{orderNo,jdbcType=VARCHAR}
+  </select>
 </mapper>