diff --git a/ms-api/src/main/java/com/ms/api/dto/dsapi/request/ConsigneeInfoDTO.java b/ms-api/src/main/java/com/ms/api/dto/dsapi/request/ConsigneeInfoDTO.java index 8bc3ff60..852c525b 100644 --- a/ms-api/src/main/java/com/ms/api/dto/dsapi/request/ConsigneeInfoDTO.java +++ b/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 hasDecryptFields; + private List hasDecryptFields = new ArrayList<>(); private Boolean isManualInput = false; } diff --git a/ms-biz/src/main/java/com/ms/api/service/impl/DistributionOrderServiceImpl.java b/ms-biz/src/main/java/com/ms/api/service/impl/DistributionOrderServiceImpl.java index 42e97b07..a91cea6c 100644 --- a/ms-biz/src/main/java/com/ms/api/service/impl/DistributionOrderServiceImpl.java +++ b/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 orderIdAndOpOrderMap = orders.stream().collect(Collectors.toMap(OpOrder::getOrderId, x->x)); + log.info("orderIdAndOpOrderMap" + orderIdAndOpOrderMap);; + Stream shopIdsStream = orders.stream().map(OpOrder::getShopId); Set shopIdSet = shopIdsStream.collect(Collectors.toSet()); if (shopIdSet.size() != 1 || !shopIdSet.contains(shopId)) {