From 8e2b59528437d8824511f5b502492b285fdce8c2 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Fri, 12 May 2023 17:06:37 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/impl/OrderInfoServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f1328afe..b28b7ac0 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
@@ -1858,7 +1858,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         if(ObjectUtil.isNull(orderItemInfos)){
             return R.error("税收编码为空的不允许合并，请先更新税收编码");
         }
-        Map<String, List<OrderItemInfo>> collect1 = collect.stream().collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getGgxh() + t.getSl() + t.getSpbm()));
+        Map<String, List<OrderItemInfo>> collect1 = collect.stream().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()) {