sunyu::update::remove couponName about monthCard

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

@@ -103,6 +103,20 @@ public class CouponDiscountCalculation {
          */
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.MonthCardDiscount monthCardDiscount = calculationDiscountResult.getMonthlyEnjoyCardDiscount();
         if (null != monthCardDiscount){
+            //月享卡2.0 信息回填
+            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods : goodsList) {
+                Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> optional = goods.getDiscounts().stream().filter(goodsDiscount -> ActivityTypeEnum.TYPE_38.getCode() == goodsDiscount.getType()).findFirst();
+                if(CollectionUtils.isNotEmpty(goods.getDiscounts()) && optional.isPresent()){
+                    ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount card2Discount = optional.get();
+                    for (CartGoods cartGoods : cartGoodsList) {
+                        if (StringUtils.equals(cartGoods.getCartGoodsUid(),goods.getCartGoodsUid())){
+                            cartGoods.setIsMonthCardGoods(1);
+                            cartGoods.setCouponName("");
+                            cartGoods.setCouponCode(card2Discount.getActivityCode());
+                        }
+                    }
+                }
+            }
             Boolean hasMonCardDiscountVirtualProduct = false;
             //如果购物车列表已有优惠项，则更新促销返回的优惠信息
             for (CartGoods cartGoods : cartGoodsList) {
@@ -137,21 +151,6 @@ public class CouponDiscountCalculation {
                 (ActivityTypeEnum.TYPE_37.getCode().equals(t.getType()) || ActivityTypeEnum.TYPE_38.getCode().equals(t.getType()))
                                                 && mccafeUniversalCouponCode.equals(t.getActivityCode()))).findFirst().orElse(null);
 
-        //月享卡2.0随单购
-        if (null != monthCardDiscount){
-            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods : goodsList) {
-                Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> optional = goods.getDiscounts().stream().filter(goodsDiscount -> ActivityTypeEnum.TYPE_38.getCode() == goodsDiscount.getType()).findFirst();
-                if(CollectionUtils.isNotEmpty(goods.getDiscounts()) && optional.isPresent()){
-                    ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount card2Discount = optional.get();
-                    for (CartGoods cartGoods : cartGoodsList) {
-                        if (StringUtils.equals(cartGoods.getCartGoodsUid(),goods.getCartGoodsUid())){
-                            cartGoods.setIsMonthCardGoods(1);
-                            cartGoods.setCouponCode(card2Discount.getActivityCode());
-                        }
-                    }
-                }
-            }
-        }
 
         for (CartGoods cartGoods : cartGoodsList) {
             if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {