Merge branch 'master' of hyq/ccnet-wx-mp3.0 into master

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

@@ -53,7 +53,7 @@ public class Ceb311OrderBiz implements CebReqBiz {
         //查询中网电子订单数据
         List list = ceb311OrderGetDate.getData(reqParam);
         if (list.isEmpty()) {
-            String info = "【CEB311】没有订单数据, 生成海关支付单报文提前结束";
+            String info = "【CEB311】没有订单数据, 提前结束";
             LOGGER.error("--- {}", info);
             afterFailed(list);
             return ResponseMessage.failed(info);
@@ -62,7 +62,7 @@ public class Ceb311OrderBiz implements CebReqBiz {
         //添加erp电子订单数据
         ResponseMessage responseMessage = ceb311OrderAddDate.addDate(list);
         if(!ResponseMessage.isSuccess(responseMessage)){
-            String info = "生成海关支付单初始化失败" + responseMessage.getMsg();
+            String info = "生成海关电子订单初始化失败" + responseMessage.getMsg();
             LOGGER.error("--- {}", info);
             afterFailed(list);
             return ResponseMessage.failed(info);

src/main/java/com/emato/ccnet/wx/biz/req/waybill/oms/Ceb511OmsWayAddDate.java

@@ -27,7 +27,7 @@ public class Ceb511OmsWayAddDate implements CebReqAddDate {
         //运单数据的初始化
         int cusWaybill = cusWaybillService.addCusWaybill(list);
         if(cusWaybill != 1){
-            String info = "初始化批量海关支付单记录新增失败";
+            String info = "初始化批量海关运单记录新增失败";
             LOGGER.error("--- {}", info);
             return ResponseMessage.failed();
         }

src/main/java/com/emato/ccnet/wx/biz/req/waybill/oms/Ceb511SendDateRequest.java

@@ -68,7 +68,7 @@ public class Ceb511SendDateRequest implements CebReqSendDate{
         //查找当前ccnet中的所有电子订单
         List<CusWaybill> cusWaybills = cusWaybillService.findAllCusWaybill();
         if(cusWaybills == null){
-            String info = "查找当前ccnet中的所有电子订单失败";
+            String info = "查找当前ccnet中的所有运单失败";
             LOGGER.error("--- {}", info);
             return ResponseMessage.failed(info);
         }