记录商品参数的券优惠数量

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

@@ -218,15 +218,21 @@ public class CouponPromotionService implements IPromotionService {
         for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
             if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
                 for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
-                    ActivityDiscountsDto activityDiscountsDto = getActivityDiscountDto(calculationDiscountResult.getApportionGoods(), couponDiscount);
-                    if (activityDiscountsDto != null) {
-                        ActivityDiscountsDto activityDiscountsDto1 = new ActivityDiscountsDto();
-                        BeanUtils.copyProperties(activityDiscountsDto, activityDiscountsDto1);
-                        activityDiscountsDto1.setDiscountAmount(-activityDiscountsDto.getDiscountAmount());
+                    if(Objects.equals(couponDiscount.getActivityType(),ActivityTypeEnum.TYPE_330.getCode())){
+                        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> collect = calculationDiscountResult.getGoods().stream().filter(goods -> Objects.equals(cartGoods.getCartGoodsUid(), goods.getCartGoodsUid())).collect(Collectors.toList());
+                        //商品优惠赋值
+                        getActivityDiscountDto2(collect,cartGoods);
+                    }else {
+                        ActivityDiscountsDto activityDiscountsDto = getActivityDiscountDto(calculationDiscountResult.getApportionGoods(), couponDiscount);
+                        if (activityDiscountsDto != null) {
+                            ActivityDiscountsDto activityDiscountsDto1 = new ActivityDiscountsDto();
+                            BeanUtils.copyProperties(activityDiscountsDto, activityDiscountsDto1);
+                            activityDiscountsDto1.setDiscountAmount(-activityDiscountsDto.getDiscountAmount());
 
-                        cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
-                        cartGoods.setSalePrice(0L);
-                        cartGoods.setActivityDiscountsDtos(Arrays.asList(activityDiscountsDto1));
+                            cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
+                            cartGoods.setSalePrice(0L);
+                            cartGoods.setActivityDiscountsDtos(Arrays.asList(activityDiscountsDto1));
+                        }
                     }
                 }
             }
@@ -269,6 +275,30 @@ public class CouponPromotionService implements IPromotionService {
         return null;
     }
 
+    private ActivityDiscountsDto getActivityDiscountDto2(List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goods, ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods) {
+        if(CollectionUtils.isNotEmpty(goods)){
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods1 = goods.get(0);
+            List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discounts = goods1.getDiscounts();
+            if(CollectionUtils.isNotEmpty(discounts) && Objects.equals(discounts.get(0).getType(),ActivityTypeEnum.TYPE_330.getCode())){
+                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                activityDiscountsDto.setActivityCode(discounts.get(0).getActivityCode());
+                activityDiscountsDto.setActivityName(discounts.get(0).getActivityName());
+                activityDiscountsDto.setActivityType(this.convent2ActivityType(discounts.get(0).getType()));
+                activityDiscountsDto.setDiscountAmount(0 - discounts.get(0).getDiscount().intValue());
+                activityDiscountsDto.setActualActivityGoodsNumber(discounts.get(0).getActualGoodsNumber());
+                activityDiscountsDto.setCartGoodsUid(goods1.getCartGoodsUid());
+
+                //商品优惠赋值
+                cartGoods.setTotalDiscountAmount(-goods1.getDiscountAmount().intValue());
+                cartGoods.setSalePrice(goods1.getNowPrice());
+                cartGoods.setActivityDiscountsDtos(Arrays.asList(activityDiscountsDto));
+                return activityDiscountsDto;
+            }
+
+        }
+        return null;
+    }
+
 
     public ActivityClassifyCouponBean createEmptyActivityCouponBean() {
         ActivityClassifyCouponBean activityClassifyCouponBean = new ActivityClassifyCouponBean();
@@ -285,6 +315,10 @@ public class CouponPromotionService implements IPromotionService {
         if (type != null && Hg.equals(type)) {
             type = 32;
         }
+        Integer buyMsendN = 330;
+        if (type != null && buyMsendN.equals(type)) {
+            type = 32;
+        }
         return type;
     }
 }