yh

ms-api/src/main/java/com/ms/api/dto/dsapi/request/ConsigneeInfoDTO.java

@@ -2,6 +2,7 @@ package com.ms.api.dto.dsapi.request;
 
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -20,6 +21,6 @@ public class ConsigneeInfoDTO {
     private String address;
     private String fullAddress;
     private Boolean hasHide = true;
-    private List<String> hasDecryptFields;
+    private List<String> hasDecryptFields = new ArrayList<>();
     private Boolean isManualInput = false;
 }

ms-biz/src/main/java/com/ms/api/service/impl/DistributionOrderServiceImpl.java

@@ -1065,6 +1065,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             throw new RuntimeException("订单不存在");
         }
         Map<String, OpOrder> orderIdAndOpOrderMap = orders.stream().collect(Collectors.toMap(OpOrder::getOrderId, x->x));
+        log.info("orderIdAndOpOrderMap" + orderIdAndOpOrderMap);;
+
         Stream<Long> shopIdsStream = orders.stream().map(OpOrder::getShopId);
         Set<Long> shopIdSet = shopIdsStream.collect(Collectors.toSet());
         if (shopIdSet.size() != 1 || !shopIdSet.contains(shopId)) {