diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java index dd897d55..4774833a 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java @@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * @author liangyuhuan @@ -447,6 +448,9 @@ public class BuyerServiceImpl implements BuyerService { } String buyerId = baseService.getGenerateShotKey(); if (CollectionUtil.isNotEmpty(buyerEntity.getBuyerEntityDetail())) { + Map collect = buyerEntity.getBuyerEntityDetail().stream().collect(Collectors.toMap(t -> t.getAddress() + t.getPhone() + t.getBankName() + t.getBankAccount(), t -> t)); + List collect1 = collect.values().stream().collect(Collectors.toList()); + buyerEntity.setBuyerEntityDetail(collect1); for (BuyerEntityDetail t : buyerEntity.getBuyerEntityDetail()) { if(ConfigureConstant.STRING_1.equals(buyerEntity.getIsEdit())){ t.setUpdateUser(""); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index db362dd5..acf81d4f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1912,7 +1912,8 @@ public class OrderInfoServiceImpl implements OrderInfoService { orderItemInfoMapper.insertOrderItemByList(orderItemInfoList); } //更新清单标志 - if(orderItemInfos.size() > 8 &&orderItemInfos.size() - deleteItem.size() < 8 ){ + OrderInfo orderInfo1 = orderMapper.selectOrderInfoByOrderId(orderInfoId, null); + if("1".equals(orderInfo1.getQdBz())&&orderItemInfos.size() - deleteItem.size() < 8 ){ OrderInfo orderInfo = new OrderInfo(); orderInfo.setId(orderInfoId); orderInfo.setQdBz("0");