fix:代服空指针问题出来

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -200,6 +200,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             //2.请求
             log.info("开始推送订单,参数: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.CREAT_ORDER, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return new ErpOrderResponse();
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             //3.处理请求结果
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
@@ -256,6 +259,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             //2.请求
             log.info("开始取消订单,参数: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.ORDER_CANCEL, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return new ErpOrderResponse();
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             //3.处理请求结果
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
@@ -311,6 +317,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             //2.请求
             log.info("开始取消订单,参数: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.ORDER_CANCEL, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return new ErpOrderResponse();
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             //3.处理请求结果
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
@@ -360,6 +369,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             //2.请求
             log.info("开始取消订单,参数: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.ORDER_CANCEL, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return new ErpOrderResponse();
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             //3.处理请求结果
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
@@ -412,6 +424,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
                         map.put("mailNumber", mailNumber);
                         log.info("开始查询路由结果,参数为: {}", JSON.toJSONString(map));
                         String response = client.execute(RequestUrlEnum.ORDER_DELIVERY, map, dfAccountId);
+                        if (StringUtils.isBlank(response)) {
+                            return erpDeliverysResponse;
+                        }
                         DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
                         if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
                             dfApiResponse.setCode(mailNumber);
@@ -595,10 +610,16 @@ public class DfOrderServiceImpl implements IErpOrderService {
         Map<String, Object> map = new HashMap<>();
         Long orderId = order.getOrderId();
         Long dfAccountId = getSFAccountIndex(orderId);
+        if (dfAccountId == null){
+            log.info("代服管家 getOrderDeliveryStatus-订单id: {}", orderId);
+        }
         map.put("orderNumber", order.getOrderCode());
         map.put("mailNumber", order.getDeliverySn());
         try {
             String response = client.execute(RequestUrlEnum.ORDER_DELIVERY_STATUS, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return;
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             if ("运单不存在".equals(dfApiResponse.getMsg())) {
 
@@ -832,6 +853,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
         map.put("mailNumber", order.getDeliveryId());
         try {
             String response = client.execute(RequestUrlEnum.ORDER_DELIVERY_STATUS, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return;
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             if ("运单不存在".equals(dfApiResponse.getMsg())) {
 
@@ -927,6 +951,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
         map.put("mailNumber", order.getDeliverySn());
         try {
             String response = client.execute(RequestUrlEnum.ORDER_DELIVERY_STATUS, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return;
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             if ("运单不存在".equals(dfApiResponse.getMsg())) {
                 //查看原来物流状态
@@ -1128,6 +1155,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             //2.请求
             log.info("开始推送订单,参数: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.CREAT_ORDER, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return new ErpOrderResponse();
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             //3.处理请求结果
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
@@ -1179,6 +1209,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             //2.请求
             log.info("开始推送订单,参数: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.CREAT_ORDER, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return new ErpOrderResponse();
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             //3.处理请求结果
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
@@ -1226,6 +1259,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             //2.请求
             log.info("开始推送订单,参数: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.CREAT_ORDER, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return new ErpOrderResponse();
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             //3.处理请求结果
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
@@ -1688,6 +1724,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             String status = map.get("exInterfaceType").toString();
             log.info("开始查询订单结果,参数为: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.ORDER_RESULT, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return ;
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
                 log.info("查询订单结果,结果: {}", JSON.toJSONString(dfApiResponse));
@@ -1741,6 +1780,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             String status = map.get("exInterfaceType").toString();
             log.info("开始查询订单结果,参数为: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.ORDER_RESULT, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return;
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
                 log.info("查询订单结果,结果: {}", JSON.toJSONString(dfApiResponse));
@@ -1794,6 +1836,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             String status = map.get("exInterfaceType").toString();
             log.info("开始查询订单结果,参数为: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.ORDER_RESULT, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return;
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
                 log.info("查询订单结果,结果: {}", JSON.toJSONString(dfApiResponse));
@@ -2204,6 +2249,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
             String status = map.get("exInterfaceType").toString();
             log.info("开始查询订单结果,参数为: {}", JSON.toJSONString(map));
             String response = client.execute(RequestUrlEnum.ORDER_RESULT, map, dfAccountId);
+            if (StringUtils.isBlank(response)) {
+                return;
+            }
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
                 log.info("查询订单结果,结果: {}", JSON.toJSONString(dfApiResponse));