订单快递包材合并

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -494,12 +494,20 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
             orderSkuProductionCostList.add(productionCostList);
         }
-
+        // 合并相同快递包材
+        Map<Long, OrderPackageBom> map = orderPackageBomList.stream().collect(Collectors.toMap(
+                OrderPackageBom::getBomSpecId,
+                Function.identity(),
+                (v1, v2) -> {
+                    v1.setQuantity(v1.getQuantity().add(v2.getQuantity()));
+                    return v1;
+                }
+        ));
         context.getSaveOrderList().add(orderInfo);
         context.getSaveOrderSkuList().addAll(orderSkuList);
         context.getSaveOrderSkuBomList().addAll(orderSkuBomList);
         context.getSaveOrderSkuProductionCostList().addAll(orderSkuProductionCostList);
-        context.getOrderPackageBomList().addAll(orderPackageBomList);
+        context.getOrderPackageBomList().addAll(new ArrayList<>(map.values()));
     }
 
     /**