sunyu::update::new function about 月享卡2.0

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -123,10 +123,6 @@ public class ActivityCalculationDiscountResponseDto {
              */
             private Long discountAmount;
             /**
-             * 月享卡名称
-             */
-            private String cardName;
-            /**
              * 月享卡券号
              */
             private String couponCode;

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

 package cn.freemud.entities.dto.shoppingCart;
 
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.OrderProductAddInfo;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
@@ -92,6 +93,12 @@ public class ShoppingCartGoodsDto {
      * 订单享受的促销活动
      */
     private List<ActivityDiscountsDto> activityDiscountsDtos;
+
+    /**
+     * 月享卡2.0优惠集合
+     */
+    private ActivityCalculationDiscountResponseDto.CalculationDiscountResult.MonthCardDiscount monthCardDiscount;
+
     /**
      * 扣减库存
      */

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -35,6 +35,7 @@ public enum ActivityTypeEnum {
     TYPE_31(31, "折扣券"),
     TYPE_32(32, "商品券"),
     TYPE_37(37, "月享卡种子券"),
+    TYPE_38(38,"月享卡2.0"),
     TYPE_5(5, "整单满金额折"),
     TYPE_51(51, "每满金额折"),
     TYPE_52(52, "阶梯满金额折"),

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

@@ -118,11 +118,11 @@ public class CouponDiscountCalculation {
                 CartGoods virtualProduct = new CartGoods();
                 virtualProduct.setSkuId("9999");
                 virtualProduct.setSpuId("9999");
-                virtualProduct.setSkuName(monthCardDiscount.getCardName());
-                virtualProduct.setSpuName(monthCardDiscount.getCardName());
+                virtualProduct.setSkuName(monthCardDiscount.getDiscountDesc());
+                virtualProduct.setSpuName(monthCardDiscount.getDiscountDesc());
                 virtualProduct.setCouponCode(monthCardDiscount.getCouponCode());
                 virtualProduct.setPic(monthCardDiscount.getCouponLogo());
-                virtualProduct.setCouponName(monthCardDiscount.getCardName());
+                virtualProduct.setCouponName(monthCardDiscount.getDiscountDesc());
                 virtualProduct.setAmount(monthCardDiscount.getDiscountAmount());
                 cartGoodsList.add(virtualProduct);
             }
@@ -206,6 +206,15 @@ public class CouponDiscountCalculation {
             return;
         }
 
+        /**
+         * 月享卡2.0 促销单独返回 月享卡优惠
+         */
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult.MonthCardDiscount monthCardDiscount = calculationDiscountResult.getMonthlyEnjoyCardDiscount();
+        if (calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> ActivityTypeEnum.TYPE_38.getCode().equals(discount.getType())) && null == monthCardDiscount){
+            return;
+        }
+        shoppingCartGoodsDto.setMonthCardDiscount(monthCardDiscount);
+
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
         if (CollectionUtils.isEmpty(goodsList)) {
             return;