新算价 买m赠n券

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

@@ -1450,17 +1450,20 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 cartGoods.setName(checkSpqInfoResponseDto.getCouponName());
                 cartGoods.setSpuName(checkSpqInfoResponseDto.getCouponName());
                 cartGoods.setStockLimit(checkSpqInfoResponseDto.isStockLimit());
-                //买M赠N券，不重复加促销券集合字段
-                for (ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon discountCoupon : coupons){
-                    if(Objects.equals(discountCoupon.getCode(),couponCode)){
-                        continue;
-                    }
-                    // 添加请求的优惠券信息
+                if (GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType())) {
+                    cartGoods.setName(checkSpqInfoResponseDto.getSkuName());
+                    cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
+                }
+                //添加请求的优惠券信息 买M赠N券，不重复加促销券集合字段
+                String finalCouponCode = couponCode;
+                List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> collect = coupons.stream().filter(calculationDiscountCoupon -> Objects.equals(calculationDiscountCoupon.getCode(), finalCouponCode)).collect(toList());
+                if(CollectionUtils.isEmpty(collect)){
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                     coupon.setCode(checkSpqInfoResponseDto.getCouponCode());
                     coupon.setActivityCode(checkSpqInfoResponseDto.getActiveCode());
                     coupons.add(coupon);
                 }
+
                 // 添加商品券代表的商品
                 // 换购券传给促销要带code
                 String goodsId = StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId();