Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-example/src/main/java/com/sckw/example/controller/TransportController.java

@@ -71,5 +71,10 @@ public class TransportController {
         return integer;
     }
 
+    @RequestMapping(value = "/refreshScopeDemo", method = RequestMethod.GET)
+    public void refreshScopeDemo(){
+        transportService.refreshScopeDemo();
+    }
+
 
 }

sckw-modules/sckw-example/src/main/java/com/sckw/example/service/TransportService.java

@@ -3,6 +3,8 @@ package com.sckw.example.service;
 import com.sckw.transport.api.dubbo.TransportStatisticsService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,8 +14,13 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
+@RefreshScope
 public class TransportService {
 
+
+    @Value("${refreshScope.demo}")
+    private String refreshScope;
+
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private TransportStatisticsService statisticsService;
 
@@ -28,4 +35,9 @@ public class TransportService {
     public Integer statisticsPendingVerificationWaybill(Long topEntId) {
         return statisticsService.statisticsPendingVerificationWaybill(topEntId);
     }
+
+
+    public void refreshScopeDemo() {
+        System.out.println("refreshScope:" + refreshScope);
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -666,6 +666,9 @@ public class LogisticsConsignmentService {
         stringList = stringList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
         for (String id : stringList) {
             OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.parseLong(id));
+            if (orderDetailRes==null){
+                continue;
+            }
             /**
              * 0销售展示是供应配送  1采购展示是采购自提
              * 根据提货方式（0供应配送/1采购自提）
@@ -723,6 +726,9 @@ public class LogisticsConsignmentService {
      */
     public HttpResult logisticsOrderCount(String id, String type) {
         OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.parseLong(id));
+        if (orderDetailRes==null){
+            return HttpResult.ok();
+        }
         /**根据下单方式（代客下单/自主下单）决定托运数据是否展示*/
         boolean flag = false;
         if (String.valueOf(NumberConstant.ONE).equals(orderDetailRes.getSource())) {
@@ -774,6 +780,9 @@ public class LogisticsConsignmentService {
         List<LogisticsOrderDTO> returnList = new ArrayList<>();
         for (String id : stringList) {
             OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.parseLong(id));
+            if (orderDetailRes==null){
+                continue;
+            }
             log.info("贸易订单数据:{}", JSONObject.toJSONString(orderDetailRes));
             log.info("贸易订单数据类型:{}", orderDetailRes.getPickupType());
             /**