From 46eccbabeee86219186147cb7af8c6814a2d7e72 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 30 Jun 2023 13:46:53 +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=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=90=88=E5=B9=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderMergeServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 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 568816c7..c87c3f96 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 @@ -995,9 +995,10 @@ public class OrderMergeServiceImpl implements OrderMergeService { deleteItem.addAll(value.stream().map(t->t.getId()).collect(Collectors.toList())); } - if(!orderItemInfoList.isEmpty()){ - mergeOutItem.addAll(orderItemInfoList); + if(orderItemInfoList.isEmpty()){ + R.error("当前勾选明细行未发现满足合并条件的数据"); } + mergeOutItem.addAll(orderItemInfoList); log.debug("明细合并合并后{}", JSONObject.toJSONString(mergeOutItem)); //对比合计税额的误差,此处将不参与和与参与合并合并对比