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 58d6fe4f..9ed2cb43 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());