feature：明细合并

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);
     }

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());