fix 买三赠一，todo

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/enums/SaveCouponType.java

@@ -5,6 +5,7 @@ public enum SaveCouponType {
     COUPON(1, "代金券"),
     FREIGHT_COUPON(2, "运费券"),
     MON_COUPON(3, "随单购月卡"),
+    THREE_TO_ONE_COUPON(4, "买三赠一券"),
     ;
 
     private Integer code;

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

@@ -23,7 +23,7 @@ public class ActivityDiscountsDto {
     private Integer activityType;
     private String tenderId;
     /**
-     * 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
+     * 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券 7-买三赠一券
      */
     private Integer extendType;
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -97,6 +97,11 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      */
     private String monthlyCardCode;
 
+    /**
+     * 各类券信息
+     */
+    private List<CouponType> couponTypeList;
+
     @Data
     public final static class SendGoods {
         /**
@@ -126,6 +131,18 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
         private String ruleId;
     }
 
+    @Data
+    public final static class CouponType {
+        /**
+         * 券类型 1：买三赠一券
+         */
+        private Integer type;
+        /**
+         * 券code
+         */
+        private String code;
+    }
+
     /**
      * 运费券code
      */

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

@@ -32,6 +32,7 @@ public enum ActivityTypeEnum {
     TYPE_3(3, "代金券"),
     TYPE_31(31, "折扣券"),
     TYPE_32(32, "商品券"),
+    TYPE_35(35, "买三赠一券"),
     TYPE_5(5, "整单满金额折"),
     TYPE_51(51, "每满金额折"),
     TYPE_52(52, "阶梯满金额折"),

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

@@ -78,7 +78,8 @@ public class CouponDiscountCalculation {
 
         if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())
                 || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
-                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())) ))) {
+                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType()))
+                || (ActivityTypeEnum.TYPE_35.getCode().equals(discount.getType())) ))) {
             return;
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
@@ -92,7 +93,7 @@ public class CouponDiscountCalculation {
             return;
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> couponDiscounts = discounts.stream().filter(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
-                || (ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())))).collect(Collectors.toList());
+                || (ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_35.getCode().equals(discount.getType())))).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(couponDiscounts)) {
             return;
         }
@@ -130,6 +131,8 @@ public class CouponDiscountCalculation {
                     cartGoods.setCouponName(goodsDiscount.getActivityName());
                 }
             }
+
+
         }
 
         // 当couponCode不为空时，需计算优惠价格
@@ -149,7 +152,8 @@ public class CouponDiscountCalculation {
 
         if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())
                 || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
-                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())) ))) {
+                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType()))
+                || (ActivityTypeEnum.TYPE_35.getCode().equals(discount.getType()))))) {
             return;
         }
         //订单级别券优惠
@@ -158,7 +162,7 @@ public class CouponDiscountCalculation {
             return;
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = couponDiscounts.stream().filter(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
-                || (ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())))).collect(Collectors.toList());
+                || (ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_35.getCode().equals(discount.getType())))).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(discounts)) {
             return;
         }

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

@@ -133,4 +133,13 @@ public class MCoffeeAddGoodsRequestVo {
      */
     private String groupName;
 
+    /**
+     * 买三赠一券code
+     */
+    private String threeToOneCouponCode;
+    /**
+     * 买三赠一券活动号
+     */
+    private String threeToOneActivityCode;
+
 }