麦咖啡随单购卡优惠 1

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

@@ -177,12 +177,11 @@ public class CouponDiscountCalculation {
         // 匹配随单购悦享卡
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount = discounts.stream().filter(t -> (ActivityTypeEnum.TYPE_32.getCode().equals(t.getType()) && mccafeUniversalCouponCode.equals(t.getActivityCode()))).findFirst().orElse(null);
         for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
+            if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
+                continue;
+            }
             //商品券商品
-            if (StringUtils.isNotEmpty(cartGoods.getCouponCode()) || discount != null) {
-
-                if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
-                    continue;
-                }
+            if (StringUtils.isNotEmpty(cartGoods.getCouponCode()) ) {
                 List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
                 if (CollectionUtils.isNotEmpty(discounts)) {
                     for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount couponDiscount : discounts) {
@@ -202,12 +201,18 @@ public class CouponDiscountCalculation {
                         }
                     }
                 }
-                if (discount != null) {
+            }
+            cartGoods.setCustomerCode(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
+            List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> list = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
+            if (CollectionUtils.isNotEmpty(list) && discount != null) {
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = list.stream().filter(t -> (ActivityTypeEnum.TYPE_32.getCode().equals(t.getType()) && mccafeUniversalCouponCode.equals(t.getActivityCode()))).findFirst().orElse(null);
+                if (goodsDiscount != null){
+                    List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
                     ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                    activityDiscountsDto.setActivityCode(discount.getActivityCode());
-                    activityDiscountsDto.setActivityName(discount.getActivityName());
-                    activityDiscountsDto.setActivityType(discount.getType());
-                    activityDiscountsDto.setDiscountAmount(0 - discount.getDiscount());
+                    activityDiscountsDto.setActivityCode(goodsDiscount.getActivityCode());
+                    activityDiscountsDto.setActivityName(goodsDiscount.getActivityName());
+                    activityDiscountsDto.setActivityType(goodsDiscount.getType());
+                    activityDiscountsDto.setDiscountAmount(0 - goodsDiscount.getDiscount().intValue());
                     activityDiscountsDto.setExtendType(discount.getExtendType());
                     activityDiscountsDto.setTenderId(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
                     productActivityDiscountsDtos.add(activityDiscountsDto);
@@ -215,8 +220,6 @@ public class CouponDiscountCalculation {
                     cartGoods.setSalePrice(0L);
                     cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
                 }
-                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
-
             }
         }