From fa4d208ce4fdd7f9b2d8f95d4d042d9ef2e64606 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 4 Jul 2023 20:09: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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 2 +- .../modules/order/service/impl/OrderMergeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 2b30ac98..94530fe5 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 @@ -2046,7 +2046,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { orderInfo.setHjse(hjse.toString()); } CommonOrderInfo commonOrderInfo = new CommonOrderInfo(); - commonOrderInfo.setOrderItemInfo(collect); + commonOrderInfo.setOrderItemInfo(orderItemInfos); commonOrderInfo.setOrderInfo(orderInfo); return orderMergeService.orderItemMerge(commonOrderInfo,collect); } 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 c5555c79..48296edb 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 @@ -940,7 +940,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { //获取合并规则 String mergeRuleType = queryMergeCommodityRuleType(orderInfo.getNsrsbh()); //根据配置去判断合并规则 - Map> collect1 = orderItemInfos.stream().map(t->{ + Map> collect1 = mergeInItem.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());