From 35925d53d86e4132db0d428d2302b02d67e121ad Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 27 Jul 2023 12:01:02 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=98=8E=E7=BB=86=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=AD=98=E5=9C=A8=E5=8D=95=E6=9D=A1=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E5=90=88=E5=B9=B6=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E6=AF=94=E5=AF=B9=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderMergeServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index 91a54b29..9c949b5a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -954,8 +954,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { log.info("明细合并前明细数据，{}",JSONObject.toJSONString(orderItemInfos)); for (List value : collect1.values()) { if(value.size() == 1){ - orderItemInfoList.add(value.get(0)); - deleteItem.add(value.get(0).getId()); + mergeOutItem.add(value.get(0)); continue; } BigDecimal xmsl = new BigDecimal("0");