feature：明细合并不存在合并数据bug修复

2 years ago · 46eccbabee
parent 7c34afcbe3
commit 46eccbabee
1 changed files with 3 additions and 2 deletions
--- 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));

        //对比合计税额的误差，此处将不参与和与参与合并合并对比