老算价 满减配送费活动优惠记录到优惠总金额

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

@@ -87,8 +87,9 @@ public class DefaultPromotionService implements IPromotionService {
             // 需要算上配送券的优惠金额
             Integer discountAmount = 0;
             if (CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())) {
-                // 过滤出配送券金额
-                CouponResults couponResults = calculationDiscountResult.getCouponDiscounts().stream().filter(c -> c.getActivityType() != null && c.getActivityType().compareTo(ActivityTypeEnum.TYPE_34.getCode()) == 0).findFirst().orElse(null);
+                // 过滤出配送券金额 和 满减配送费活动金额
+                CouponResults couponResults = calculationDiscountResult.getCouponDiscounts().stream().filter(c -> c.getActivityType() != null
+                        && (c.getActivityType().compareTo(ActivityTypeEnum.TYPE_34.getCode()) == 0 || c.getActivityType().compareTo(ActivityTypeEnum.TYPE_14.getCode()) == 0)).findFirst().orElse(null);
                 if (couponResults != null) {
                     discountAmount = couponResults.getDiscountAmount();
                 }