From c490a5036677a0d2df60f0f27cd4d4974290409a Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 27 Jul 2023 09:28:48 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E6=98=8E=E7=B4=B0=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=95=8F=E9=A1=8C=E4=BF=AE=E5=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderMergeServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 c228660e..7bea5382 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 @@ -953,7 +953,11 @@ public class OrderMergeServiceImpl implements OrderMergeService { List deleteItem = new ArrayList<>(); log.debug("明细合并前明细数据，{}",JSONObject.toJSONString(orderItemInfos)); for (List value : collect1.values()) { - if(value.size() == 1){continue;} + if(value.size() == 1){ + orderItemInfoList.add(value.get(0)); + deleteItem.add(value.get(0).getId()); + continue; + } BigDecimal xmsl = new BigDecimal("0"); BigDecimal xmje = new BigDecimal("0"); BigDecimal se = new BigDecimal("0");