Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java

@@ -83,17 +83,21 @@ public class FullSharingService {
                 .collect(Collectors.toMap(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods::getCartGoodsUid, Function.identity(), (k1, k2) -> k1));
 
         long full = 0L;
+        long sum = 0L;
         for (CartGoods cart : cartGoodsList) {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods discountMap = map.get(cart.getCartGoodsUid());
             full = 0L;
+            sum = 0L;
             if (null==discountMap) continue;
             if (CollectionUtils.isNotEmpty(discountMap.getDiscounts())) {
-                CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = null;
-                discount = discountMap.getDiscounts().stream().filter(d -> typeEnums.contains(d.getType())).findFirst().orElse(null);
-                if (discount!=null) {
-                    full = discount.getDiscount();
-                    cart.setAmount(cart.getAmount()+full);
-                }
+                //CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = null;
+                //discount = discountMap.getDiscounts().stream().filter(d -> typeEnums.contains(d.getType())).findFirst().orElse(null);
+                sum = discountMap.getDiscounts()
+                        .stream()
+                        .filter(d -> typeEnums.contains(d.getType()))
+                        .mapToLong(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount::getDiscount)
+                        .sum();
+                cart.setAmount(cart.getAmount() + sum);
             }
             //小料
             if (CollectionUtils.isNotEmpty(cart.getProductMaterialList())) {