From 2e8ae0ee17385e06231fa293efd409dee39772cc Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Wed, 21 Jun 2023 11:55:33 +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=90=8D=E7=A7=B0=E3=80=81=E8=A7=84=E6=A0=BC=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E5=8D=95=E4=BD=8D=E5=88=A4=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/OrderInfoServiceImpl.java      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 3371d5dc..f1ed83b6 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
@@ -2016,14 +2016,19 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         }
         List<OrderItemInfo> collect = null;
         if(itemList != null){
-            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList());
-            if(ObjectUtil.isNull(orderItemInfos)){
+            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isBlank(t.getSpbm())).collect(Collectors.toList());
+            if(ObjectUtil.isNull(collect)){
                 return R.error("税收编码为空的不允许合并，请先更新税收编码");
             }
         }else{
             collect = orderItemInfos;
         }
-        Map<String, List<OrderItemInfo>> collect1 = collect.stream().collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm()));
+        Map<String, List<OrderItemInfo>> collect1 = collect.stream().map(t->{
+            t.setXmmc(StringUtils.isBlank(t.getXmmc())?"":t.getXmmc());
+            t.setXmdw(StringUtils.isBlank(t.getXmdw())?"":t.getXmdw());
+            t.setGgxh(StringUtils.isBlank(t.getGgxh())?"":t.getGgxh());
+            return t;
+        }).collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm()));
         List<OrderItemInfo> orderItemInfoList = new ArrayList<>();
         List<String> deleteItem = new ArrayList<>();
         for (List<OrderItemInfo> value : collect1.values()) {