总优惠金额 新增 活动满减配送费 优惠金额

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -105,11 +105,12 @@ public class CalculationCommonService {
             // 需要算上配送券的优惠金额
             Integer discountAmount = 0;
             if (CollectionUtils.isNotEmpty(discountResult.getDiscounts())) {
-                // 过滤出配送券金额
-                CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount = discountResult.getDiscounts().stream().filter(c -> c.getType() != null && c.getType().compareTo(ActivityTypeEnum.TYPE_34.getCode()) == 0).findFirst().orElse(null);
-                if (discount != null) {
-                    discountAmount = discount.getDiscount();
-                }
+                // 过滤出配送券金额 和 满减配送费活动金额
+                double sum = discountResult.getDiscounts().stream()
+                        .filter(c -> c.getType() != null && (c.getType().compareTo(ActivityTypeEnum.TYPE_34.getCode()) == 0 || c.getType().compareTo(ActivityTypeEnum.TYPE_14.getCode()) == 0))
+                        .mapToDouble(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount::getDiscount)
+                        .sum();
+                discountAmount = Double.valueOf(sum).intValue();
             }
             shoppingCartGoodsResponseVo.setTotalDiscountAmount(discountResult.getTotalDiscountAmount() + discountAmount);
         }