sunyu::update::fix bug about monthCard2.0

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

@@ -312,6 +312,15 @@ public class ShoppingCartMCoffeeServiceImpl {
                     coupons.add(calculationDiscountCoupon);
                 }
 
+                //月享卡加购时，将券号传给促销
+                if (null != cartGoods
+                        && null != cartGoods.getMonthCardInfo()
+                        && StringUtils.isNotEmpty(cartGoods.getMonthCardInfo().getCardCode())){
+                    ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                    calculationDiscountCoupon.setCode(cartGoods.getMonthCardInfo().getCardCode());
+                    coupons.add(calculationDiscountCoupon);
+                }
+
                 //使用券的是，如果购物车已经存在这个券，先清除，再添加
                 //过滤月享卡种子券
                 if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode()) && Objects.equals(0,cartGoods.getIsMonthCardGoods())) {
@@ -367,7 +376,9 @@ public class ShoppingCartMCoffeeServiceImpl {
 //            }
             coupons.add(calculationDiscountCoupon);
         }
-
+        if (CollectionUtils.isNotEmpty(coupons)){
+            coupons = coupons.stream().distinct().collect(Collectors.toList());
+        }
         return coupons;
     }
 
@@ -1891,13 +1902,23 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
             for (CartGoods cartGoods : cartGoodsList) {
                 //购物车已存在商品券
-                if (null != cartGoods && StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
-                    ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
-                    calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
-                    coupons.add(calculationDiscountCoupon);
+                if (null != cartGoods) {
+                    if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
+                        ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                        calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
+                        coupons.add(calculationDiscountCoupon);
+                    }
+                    if (null != cartGoods.getMonthCardInfo() && StringUtils.isNotEmpty(cartGoods.getMonthCardInfo().getCardCode())) {
+                        ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                        calculationDiscountCoupon.setCode(cartGoods.getMonthCardInfo().getCardCode());
+                        coupons.add(calculationDiscountCoupon);
+                    }
                 }
             }
         }
+        if (CollectionUtils.isNotEmpty(coupons)){
+            coupons = coupons.stream().distinct().collect(Collectors.toList());
+        }
         return coupons;
     }