feature：1、明细合并判断清单标志为1的需要判断合并后明细行、2、新增、编辑客户信息相同明细行相同的去重

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<String, BuyerEntityDetail> collect = buyerEntity.getBuyerEntityDetail().stream().collect(Collectors.toMap(t -> t.getAddress() + t.getPhone() + t.getBankName() + t.getBankAccount(), t -> t));
+            List<BuyerEntityDetail> collect1 = collect.values().stream().collect(Collectors.toList());
+            buyerEntity.setBuyerEntityDetail(collect1);
             for (BuyerEntityDetail t : buyerEntity.getBuyerEntityDetail()) {
                 if(ConfigureConstant.STRING_1.equals(buyerEntity.getIsEdit())){
                     t.setUpdateUser("");

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");