From 7ec4c029d2c9e718d599843b77caa6206d8d87f2 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 15 May 2023 14:31:50 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A1=E3=80=81=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=A4=E6=96=AD=E6=B8=85=E5=8D=95=E6=A0=87?= =?UTF-8?q?=E5=BF=97=E4=B8=BA1=E7=9A=84=E9=9C=80=E8=A6=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=90=88=E5=B9=B6=E5=90=8E=E6=98=8E=E7=BB=86=E8=A1=8C?= =?UTF-8?q?=E3=80=812=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=8C=E7=9B=B8=E5=90=8C=E7=9A=84=E5=8E=BB?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/buyer/service/impl/BuyerServiceImpl.java | 4 ++++ .../modules/order/service/impl/OrderInfoServiceImpl.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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");