处理京东发货处理漏洞。

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -2273,19 +2273,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             }
             //京东订单发货
             if (salesOrder.getSalesBatchId().startsWith("JT")) {
-
-
-
-//                SysConfig sysConfigAll = sysConfigService.getSysConfigAll(27);
-//                JdClient client = new DefaultJdClient(JingdongConfig.JINGDONG_API_URL, sysConfigAll.getConfigParameter(), JingdongConfig.jd_appkey, JingdongConfig.jd_secret);
-//                PopOrderShipmentRequest req = new PopOrderShipmentRequest();
-//                req.setOrderId(Long.parseLong(salesOrder.getSalesOrderId()));
-//                req.setLogiCoprId(salesOrder.getSalesPostFirm());
-//                req.setLogiNo(o.getSalesPostNum());
                 try {
-//                    PopOrderShipmentResponse rsp = client.execute(req);
-//                    logger.info("京东订单发货回录：code:{}, msg:{}", rsp.getCode(), rsp.getMsg());
-
                     Map<String, String> params = new HashMap<>();
                     params.put("orderId", salesOrder.getSalesOrderId());
                     params.put("logiCoprId", logisticsInfoService.getLogisticsNameByRSTCode(salesOrder.getSalesPostFirm()).getLogisticsXytCode());
@@ -2297,8 +2285,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                         if (operatorResult.getSuccess()) {
                             logger.info("京东发货回传请求成功：result=SUCCESS:{}, MSG:{}", operatorResult.getSuccess(), operatorResult.getChineseErrCode());
                         } else {
-                            logger.info("京东发货回传请求失败：result=SUCCESS:{}, MSG:{}", operatorResult.getSuccess(), operatorResult.getChineseErrCode());
-                            throw new RuntimeException("京东发货回传请求失败：" + operatorResult.getChineseErrCode());
+                            logger.info("京东发货回传请求失败：订单号：{}, code:{}, error:{}, MSG:{}", salesOrder.getSalesOrderId(), operatorResult.getErrorCode(), operatorResult.getEnglishErrCode(), operatorResult.getChineseErrCode());
+                            throw new RuntimeException("京东发货回传请求失败：" + operatorResult.getErrorCode());
                         }
                     } else {
                         logger.info("京东发货回传请求错误：{}", result);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/JingdongTask.java

@@ -273,7 +273,7 @@ public class JingdongTask {
         req.setLogiNo(logiNo);
         try {
             PopOrderShipmentResponse rsp = client.execute(req);
-            logger.info("京东订单发货回录：code:{}, msg:{}", rsp.getCode(), rsp.getMsg());
+            logger.info("京东订单发货回录：订单:{}, code:{}, msg:{}", orderId, rsp.getCode(), rsp.getMsg());
             if ("0".equals(rsp.getCode())) {
                 OperatorResult sopjosshipmentResult = rsp.getSopjosshipmentResult();
                 return sopjosshipmentResult;