fix 优惠券折扣取值变更

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -75,9 +75,9 @@ public class CouponDiscountCalculation {
      */
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
 
-        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getCouponDiscounts())
-                || !calculationDiscountResult.getCouponDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getActivityType())
-                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getActivityType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getActivityType())) ))) {
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())
+                || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
+                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())) ))) {
             return;
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
@@ -119,28 +119,34 @@ public class CouponDiscountCalculation {
 
         // 当couponCode不为空时，需计算优惠价格
         long couponDiscount = 0;
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
-        if (CollectionUtils.isNotEmpty(couponResultsList)) {
-            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
-                couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = calculationDiscountResult.getDiscounts();
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> couponDiscounts = discounts.stream().filter(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
+                || (ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())))).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(couponDiscounts)) {
+            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount couponResults : couponDiscounts) {
+                couponDiscount = couponDiscount + (couponResults.getDiscount() == null ? 0 : couponResults.getDiscount());
             }
         }
         shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
     }
 
-
     /**
      * 商品均摊
      */
     public void updateShoppingCartGoodsApportion(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto){
 
-        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getCouponDiscounts())
-                || !calculationDiscountResult.getCouponDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getActivityType())
-                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getActivityType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getActivityType())) ))) {
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())
+                || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
+                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())) ))) {
             return;
         }
         //订单级别券优惠
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponDiscounts =  calculationDiscountResult.getCouponDiscounts();
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> couponDiscounts =  calculationDiscountResult.getDiscounts();
+        if (CollectionUtils.isEmpty(couponDiscounts)) {
+            return;
+        }
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = couponDiscounts.stream().filter(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
+                || (ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())))).collect(Collectors.toList());
 
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
         if (CollectionUtils.isEmpty(goodsList)) {
@@ -154,18 +160,20 @@ public class CouponDiscountCalculation {
             //商品券商品
             if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
                 List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
-                for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
-                    if(couponDiscount.getCouponCode().equals(cartGoods.getCouponCode())){
-                        ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                        activityDiscountsDto.setActivityCode(couponDiscount.getCouponCode());
-                        activityDiscountsDto.setActivityName(couponDiscount.getActivityName());
-                        activityDiscountsDto.setActivityType(couponDiscount.getActivityType());
-                        activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount());
-                        productActivityDiscountsDtos.add(activityDiscountsDto);
-
-                        cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
-                        cartGoods.setSalePrice(0L);
-                        cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
+                if (CollectionUtils.isNotEmpty(discounts)) {
+                    for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount couponDiscount : discounts) {
+                        if (couponDiscount.getActivityCode().equals(cartGoods.getCouponCode())) {
+                            ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                            activityDiscountsDto.setActivityCode(couponDiscount.getActivityCode());
+                            activityDiscountsDto.setActivityName(couponDiscount.getActivityName());
+                            activityDiscountsDto.setActivityType(couponDiscount.getType());
+                            activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscount());
+                            productActivityDiscountsDtos.add(activityDiscountsDto);
+
+                            cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
+                            cartGoods.setSalePrice(0L);
+                            cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
+                        }
                     }
                 }