Merge branch 'release' into test

2 years ago · d4b757be63
parent c3d1ba6ed8 fa4d208ce4
commit d4b757be63
1 changed files with 1 additions and 1 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
@ -940,7 +940,7 @@ public class OrderMergeServiceImpl implements OrderMergeService {
        //获取合并规则
        String mergeRuleType = queryMergeCommodityRuleType(orderInfo.getNsrsbh());
        //根据配置去判断合并规则
-        Map<String, List<OrderItemInfo>> collect1 = orderItemInfos.stream().map(t->{
+        Map<String, List<OrderItemInfo>> 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());