Merge branch 'feature/xukang_20210609_麦咖啡p7v2'

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1448,6 +1448,9 @@ public class OrderSdkAdapter {
             case "COUPON":
                 type = 10;
                 break;
+            case "B3S1_COUPON":
+                type = 35;
+                break;
             case "FREIGHT_COUPON":
                 type = 99;
                 break;
@@ -3194,13 +3197,14 @@ public class OrderSdkAdapter {
         if (null != product.getIsSendGoods() && product.getIsSendGoods()){
             extInfo.setIsSendGoods(true);
         }
+        extInfo.setIsMonthCard(product.getIsMonthCard());
+        extInfo.setIsB3S1Coupon(product.getIsB3S1Coupon());
         extInfo.setStapleFood(product.getStapleFood());
 
         extInfo.setOriginalGoodsUid(product.getOriginalGoodsUid());
         extInfo.setCartGoodsUid(product.getCartGoodsUid());
         // todo 订单行扩展字段商品组
         extInfo.setProductGroupList(product.getProductGroupList());
-        extInfo.setIsSendGoods(product.getIsSendGoods());
         // 是否需要积分，农工商发送积分需要判断商品是否是送积分的商品
         // 发积分的操作移到消费者，所以这个值需要保存下来
         if(product.getNeedBonus() != null){

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -22,6 +22,7 @@ public enum OldOrderAccountType {
     PACK_AMOUNT(3, "包装费", "PACK_AMOUNT"),
     COUPON(5, "代金券", "COUPON"),
     PRODUCT_COUPON(6, "商品券", "PRODUCT_COUPON"),
+    B3S1_COUPON(35, "买3赠1券", "B3S1_COUPON"),
     SEED_PRODUCT_COUPON(37, "种子券", "SEED_PRODUCT_COUPON"),
     EVM_PRODUCT_COUPON(39, "EVM券", "EVM_PRODUCT_COUPON"),
     DISCOUNT_COUPON(7, "折扣券", "DISCOUNT_COUPON"),

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -22,6 +22,7 @@ public enum QueryOrderAccountType {
     BUY_DISCOUNT("BUY_DISCOUNT", "满减优惠"),
     PACK_AMOUNT("PACK_AMOUNT", "包装费"),
     COUPON("COUPON", "代金券"),
+    B3S1_COUPON("B3S1_COUPON", "买3赠1券"),
     FREIGHT_COUPON("FREIGHT_COUPON", "运费券"),
     PRODUCT_COUPON("PRODUCT_COUPON", "商品券"),
     SEED_PRODUCT_COUPON("SEED_PRODUCT_COUPON", "种子券"),

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -253,4 +253,12 @@ public class CreateOrderProductRequest extends BaseConfig {
      * 是否赠品
      */
     private Boolean isSendGoods;
+    /**
+     * 是否是月享卡商品
+     */
+    private int isMonthCard = 0;
+    /**
+     * 是否是买3赠1券商品
+     */
+    private int isB3S1Coupon = 0;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

@@ -108,6 +108,14 @@ public class OrderProductAddInfoDto extends BaseConfig {
      * 虚拟商品种子券号
      */
     private String cardCode;
+    /**
+     * 是否是月享卡商品
+     */
+    private Integer isMonthCard = 0;
+    /**
+     * 是否是买3赠1券商品
+     */
+    private Integer isB3S1Coupon = 0;
 
     /**
      * 是否赠品

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -18,6 +18,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 @Data
@@ -104,6 +105,18 @@ public class CartGoods {
      */
     private MonthCardVo monthCardInfo;
     /**
+     * 是否是买3赠1券商品
+     */
+    private int isB3S1Coupon = 0;
+    /**
+     * 是否使用了买3赠1券
+     */
+    private int isB3S1CouponGoods = 0;
+    /**
+     * 买3赠1券信息
+     */
+    private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;
+    /**
      * 商品券名称
      */
     private String couponName;
@@ -329,6 +342,28 @@ public class CartGoods {
     }
 
     @Data
+    @NoArgsConstructor
+    public static class B3S1CouponGoodsInfoVo {
+        /**
+         * 卡号
+         */
+        private String cardNo;
+        /**
+         * 券号
+         */
+        private String cardCode;
+        /**
+         * 券号
+         */
+        private Set<String> cardCodeSet;
+
+        private Integer useTimes;
+
+        private int isUseB3S1Coupon = 1;
+    }
+
+
+    @Data
     public final static class ComboxGoods{
         /**
          * 单规格spuId,多规格skuId

order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -660,7 +660,9 @@ public class CouponAdapter {
     public MCCafeCouponRequest convert2MCCafeCouponRequest(QueryOrdersResponseDto.DataBean.OrderBean orderBean, QueryOrdersResponseDto.DataBean.OrderBean.AccountBean accountBean, McdNetBatchQueryResponse.Coupon coupon) {
         List<MCCafeProductRedeemVo> products = new ArrayList<>();
         //商品券核销核销参数
-        if (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType()) || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(accountBean.getType())) {
+        if (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType())
+                || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(accountBean.getType())
+                || OldOrderAccountType.B3S1_COUPON.getCode().equals(accountBean.getType())) {
             for (int i = 0; i < orderBean.getProductList().size(); i++) {
                 QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
                 String pid = org.apache.commons.lang3.StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();

order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java

@@ -784,8 +784,13 @@ public class CreateOrderAdapter {
                 });
                 createOrderProductDemoDto.setComboProduct(comboProducts);
             } else if (ProductTypeEnum.VIRTUAL_PRODUCT.getCode().equals(cartGoodsDetailDto.getProductType())) {
-                createOrderProductDemoDto.setCardId(cartGoodsDetailDto.getMonthCardInfo().getCardNo());
-                createOrderProductDemoDto.setCardCode(cartGoodsDetailDto.getMonthCardInfo().getCardCode());
+                if(cartGoodsDetailDto.getIsMonthCard() == 1) {
+                    createOrderProductDemoDto.setCardId(cartGoodsDetailDto.getMonthCardInfo().getCardNo());
+                    createOrderProductDemoDto.setCardCode(cartGoodsDetailDto.getMonthCardInfo().getCardCode());
+                } else if(cartGoodsDetailDto.getIsB3S1Coupon() == 1) {
+                    createOrderProductDemoDto.setCardId(cartGoodsDetailDto.getB3S1CouponGoodsInfo().getCardNo());
+                    createOrderProductDemoDto.setCardCode(cartGoodsDetailDto.getB3S1CouponGoodsInfo().getCardCode());
+                }
             }
         }
         if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterialList())) {

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -464,6 +464,7 @@ public class OrderAdapter {
                     .build();
             JSONObject jsonObject = new JSONObject();
             if(ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())
+                    || ActivityTypeEnum.TYPE_35.getCode().equals(activityDiscountsDto.getActivityType())
                     || ActivityTypeEnum.TYPE_37.getCode().equals(activityDiscountsDto.getActivityType())
                     || ActivityTypeEnum.TYPE_38.getCode().equals(activityDiscountsDto.getActivityType())) {
                 jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
@@ -2382,6 +2383,9 @@ public class OrderAdapter {
                         } else {
                             productVo.setFinalPrice(productVo.getOriginalPrice());
                         }
+                        if(null != extendType && extendType == 7) {
+                            productVo.setIsB3S1CouponGoods(1);
+                        }
                     }
                 }
                 if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) {
@@ -2403,6 +2407,9 @@ public class OrderAdapter {
                 if (OrderAccountType.BUY_DISCOUNT.getCode().equals(productDiscount.getDiscountType())) {
                     fullReduction = productDiscount.getDiscountAmount();
                 }
+                if (OldOrderAccountType.B3S1_COUPON.getCode().equals(productDiscount.getDiscountType())) {
+                    productVo.setIsB3S1CouponGoods(1);
+                }
             }
         }
         //优惠券满减总优惠
@@ -2662,8 +2669,15 @@ public class OrderAdapter {
                 });
                 createOrderProductDemoDto.setComboProduct(comboProducts);
             } else if(ProductTypeEnum.VIRTUAL_PRODUCT.getCode().equals(cartGoodsDetailDto.getProductType())) {
-                createOrderProductDemoDto.setCardId(cartGoodsDetailDto.getMonthCardInfo().getCardNo());
-                createOrderProductDemoDto.setCardCode(cartGoodsDetailDto.getMonthCardInfo().getCardCode());
+                createOrderProductDemoDto.setIsMonthCard(cartGoodsDetailDto.getIsMonthCard());
+                createOrderProductDemoDto.setIsB3S1Coupon(cartGoodsDetailDto.getIsB3S1Coupon());
+                if(cartGoodsDetailDto.getIsMonthCard() == 1) {
+                    createOrderProductDemoDto.setCardId(cartGoodsDetailDto.getMonthCardInfo().getCardNo());
+                    createOrderProductDemoDto.setCardCode(cartGoodsDetailDto.getMonthCardInfo().getCardCode());
+                } else if(cartGoodsDetailDto.getIsB3S1Coupon() == 1) {
+                    createOrderProductDemoDto.setCardId(cartGoodsDetailDto.getB3S1CouponGoodsInfo().getCardNo());
+                    createOrderProductDemoDto.setCardCode(cartGoodsDetailDto.getB3S1CouponGoodsInfo().getCardCode());
+                }
             }
         }
         if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterialList())) {
@@ -2836,6 +2850,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_32.getCode().equals(activityType)) {
             return OldOrderAccountType.PRODUCT_COUPON;
         }
+        if (ActivityTypeEnum.TYPE_35.getCode().equals(activityType)) {
+            return OldOrderAccountType.PRODUCT_COUPON;
+        }
         if (ActivityTypeEnum.TYPE_38.getCode().equals(activityType)) {
             return OldOrderAccountType.PRODUCT_COUPON;
         }

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

@@ -5,11 +5,13 @@ import cn.freemud.entities.vo.SubtractStockVO;
 import com.alibaba.fastjson.JSON;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 
@@ -265,12 +267,28 @@ public class ShoppingCartGoodsDto {
          * 购物车行id
          */
         private String cartGoodsUid;
+        /**
+         * 是否是月享卡商品
+         */
+        private int isMonthCard = 0;
 
         /**
          * 月享卡加购信息
          */
         private MonthCardVo monthCardInfo;
         /**
+         * 是否是买3赠1券商品
+         */
+        private int isB3S1Coupon = 0;
+        /**
+         * 是否使用了买3赠1券
+         */
+        private int isB3S1CouponGoods = 0;
+        /**
+         * 买3赠1券信息
+         */
+        private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;
+        /**
          * 是否赠品
          */
         private Boolean isSendGoods;
@@ -386,4 +404,25 @@ public class ShoppingCartGoodsDto {
         private String discountDesc;
     }
 
+    @Data
+    @NoArgsConstructor
+    public static class B3S1CouponGoodsInfoVo {
+        /**
+         * 卡号
+         */
+        private String cardNo;
+        /**
+         * 券号
+         */
+        private String cardCode;
+        /**
+         * 券号
+         */
+        private Set<String> cardCodeSet;
+
+        private Integer useTimes;
+
+        private int isUseB3S1Coupon = 1;
+    }
+
 }

order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java

@@ -191,6 +191,10 @@ public class ProductVo {
      * 优惠券名称
      */
     private String couponName;
+    /**
+     * 是否使用了买3赠1券
+     */
+    private int isB3S1CouponGoods = 0;
 
     /**
      * 1.5.5版本添加

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

@@ -32,7 +32,7 @@ public enum ActivityTypeEnum {
     TYPE_31(31, "折扣券"),
     TYPE_32(32, "商品券"),
     TYPE_34(34, "运费券"),
-    TYPE_35(35, "买1赠3券"),
+    TYPE_35(35, "买3赠1券"),
     TYPE_37(37, "种子券"),
     TYPE_38(38, "月享卡2.0"),
     TYPE_39(39, "EVM券"),

order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java

@@ -559,13 +559,17 @@ public class CheckMCCafeOrder {
         List<String> seedCardList = new ArrayList<>();
         shoppingCartGoodsDto.getProducts().stream().filter(o -> ProductTypeEnum.getVirtualProductType().contains(o.getProductType()))
         .forEach(o -> {
-            if(o.getMonthCardInfo() == null) {
+            if(o.getIsMonthCard() == 0 && o.getMonthCardInfo() == null) {
                 ShoppingCartGoodsDto.MonthCardVo monthCardVo = new ShoppingCartGoodsDto.MonthCardVo();
                 monthCardVo.setCardCode(withOrderBuyCouponCode);
                 monthCardVo.setCardNo(withOrderBuyCardId);
                 o.setMonthCardInfo(monthCardVo);
             }
-            seedCardList.add(o.getMonthCardInfo().getCardCode());
+            if(o.getIsMonthCard() == 1) {
+                seedCardList.add(o.getMonthCardInfo().getCardCode());
+            } else if(o.getIsB3S1Coupon() == 1) {
+                seedCardList.add(o.getB3S1CouponGoodsInfo().getCardCode());
+            }
         });
         seedCardList.add(withOrderBuyCouponCode);
         if(CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getActivityDiscountsDtos())) {

order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java

@@ -74,6 +74,7 @@ public class CouponClientServiceImpl implements CouponClientService {
                 account -> (OldOrderAccountType.COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.PRODUCT_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.B3S1_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.DISCOUNT_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.FREIGHT_COUPON.getCode().equals(account.getType()))
         ).collect(Collectors.toList());
@@ -147,6 +148,7 @@ public class CouponClientServiceImpl implements CouponClientService {
                 account -> (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.B3S1_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.DISCOUNT_COUPON.getCode().equals(account.getType())
                         )).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java

@@ -171,12 +171,13 @@ public class ShoppingCartMccafeAdapter {
         //菜单购月享卡信息
         cartGoodsDetailDto.setIsMonthCard(cartGoods.getIsMonthCard());
         cartGoodsDetailDto.setMonthCardInfo(cartGoods.getMonthCardInfo());
+        cartGoodsDetailDto.setIsB3S1Coupon(cartGoods.getIsB3S1Coupon());
+        cartGoodsDetailDto.setB3S1CouponGoodsInfo(cartGoods.getB3S1CouponGoodsInfo());
+        cartGoodsDetailDto.setIsB3S1CouponGoods(cartGoods.getIsB3S1CouponGoods());
         if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
         } else if(GoodsTypeEnum.VIRTUAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())){
             cartGoodsDetailDto.setProductType(ProductType.VIRTUAL_PRODUCT.getCode());
-        }else if (cartGoods.isWeightType()) {
-            cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
 
         //小料

shopping-cart-application-service/src/main/java/cn/freemud/controller/MCoffeeShoppingCartController.java

@@ -90,6 +90,15 @@ public class MCoffeeShoppingCartController {
         return shoppingCartMCoffeeService.batchUpdateGoodsQty(request);
     }
 
+    /**
+     * 向购物车中添加商品
+     */
+    @ApiAnnotation(logMessage = "removeB3S1Coupon")
+    @PostMapping(value = "/removeB3S1Coupon")
+    public BaseResponse removeB3S1Coupon(@Validated @LogParams @RequestBody MCoffeeAddGoodsRequestVo request) {
+        return shoppingCartMCoffeeService.removeB3S1Coupon(request);
+    }
+
 
     @ApiAnnotation(logMessage = "getCartInfoByUser")
     @PostMapping(value = "/getCartInfoByUser")

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

@@ -4,6 +4,7 @@ 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;
+import cn.freemud.entities.vo.B3S1CouponGoodsInfoVo;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.MonthCardVo;
 import cn.freemud.entities.vo.SubtractStockVO;
@@ -274,14 +275,22 @@ public class ShoppingCartGoodsDto {
          */
         private int isMonthCard;
         /**
-         * 是否为种子券商品 1:是；0:否
-         */
-        private int isSeedCouponGoods;
-        /**
          * 月享卡信息
          */
         private MonthCardVo monthCardInfo;
         /**
+         * 是否是买3赠1券商品
+         */
+        private int isB3S1Coupon = 0;
+        /**
+         * 是否使用了买3赠1券
+         */
+        private int isB3S1CouponGoods = 0;
+        /**
+         * 买3赠1券信息
+         */
+        private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;
+        /**
          * 商品货号
          */
         private String productCode;

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * All rights Reserved, Designed By sunary.site
+ *
+ * @version v1.0
+ * @Title: IntelliJ IDEA
+ * @Package cn.freemud.entities.vo
+ * @Description: 请简单描述下这个类是做什么用的
+ * @author: yu.sun
+ * @date: 2021-01-11 15:18:36
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+@NoArgsConstructor
+public class B3S1CouponGoodsInfoVo {
+    /**
+     * 卡号
+     */
+    private String cardNo;
+    /**
+     * 券号
+     */
+    private String cardCode;
+    /**
+     * 券号
+     */
+    private Set<String> cardCodeSet;
+
+    private Integer useTimes;
+
+    private int isUseB3S1Coupon = 1;
+}

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

@@ -49,6 +49,11 @@ public class BatchOperateCartGoodsRequestVo extends BaseRequestVo{
     private String redundancyCouponCode;
 
     /**
+     * 根据券号清除当前购物车中月卡及商品信息
+     */
+    private List<String> redundancyB3S1CouponCode;
+
+    /**
      * 是否使用月享卡2.0
      * 1 是
      * 0 否

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

@@ -240,11 +240,19 @@ public class CartGoods {
      */
     private int isMonthCard = 0;
     /**
+     * 是否是买3赠1券商品
+     */
+    private int isB3S1Coupon = 0;
+    /**
+     * 是否使用了买3赠1券
+     */
+    private int isB3S1CouponGoods = 0;
+    /**
      * 是否是太阳蛋商品
      */
     private int isSunnyCoupon=0;
     /**
-     * 是否为月享卡商品 1:是；0:否
+     * 是否为可以使用买月享卡的商品 1:是；0:否
      */
     private int isMonthCardGoods = 0;
     /**
@@ -252,6 +260,10 @@ public class CartGoods {
      */
     private MonthCardVo monthCardInfo;
     /**
+     * 买3赠1券信息
+     */
+    private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;
+    /**
      * 第三方商品编码
      */
     private String customerCode;

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

@@ -15,4 +15,11 @@ public class ClearCouponCodeRequestVo extends BaseRequestVo {
      * 0 否
      */
     private int isUseMonthCard;
+
+    /**
+     * 是否使用
+     * 1 是
+     * 0 否
+     */
+    private int isUseB3S1Coupon;
 }

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

@@ -78,6 +78,12 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      */
     private Integer isUseMonthCard = 1;
     /**
+     * 是否使用
+     * 1 是
+     * 0 否
+     */
+    private Integer isUseB3S1Coupon = 1;
+    /**
      * 优惠券对应的活动号
      */
     private String activityCode;

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

@@ -36,6 +36,7 @@ public enum ActivityTypeEnum {
     TYPE_32(32, "商品券"),
     TYPE_33(33, "换购券"),
     TYPE_37(37, "月享卡种子券"),
+    TYPE_35(35, "买3赠1券"),
     TYPE_38(38,"月享卡2.0"),
     TYPE_39(39, "EVM券"),
     TYPE_5(5, "整单满金额折"),

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

@@ -114,8 +114,7 @@ public class CalculationServiceImpl {
         timeSaleCalculation.updateShoppingCartGoodsDiscount(calculationDiscount, cartGoodsList, shoppingCartGoodsResponseVo);
 
         //优惠券
-        CouponPromotionVO couponPromotionVO = couponDiscountCalculation.getCouponPromotionVO(partnerId, storeId, userId, couponCode, orderType);
-        couponDiscountCalculation.updateShoppingCartGoodsDiscount(couponPromotionVO,calculationDiscount,cartGoodsList, shoppingCartGoodsResponseVo);
+        couponDiscountCalculation.updateShoppingCartGoodsDiscount(calculationDiscount, cartGoodsList, shoppingCartGoodsResponseVo);
 
         //套餐
         setMealCalculation.updateShoppingCartGoodsDiscount(calculationDiscount,cartGoodsList,shoppingCartGoodsResponseVo);

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

 package cn.freemud.service.impl.mcoffee.entity;
 
-import cn.freemud.entities.vo.CartGoods;
-import cn.freemud.entities.vo.ComboxGoodsRequestVo;
-import cn.freemud.entities.vo.MaterialRequestVo;
-import cn.freemud.entities.vo.MonthCardVo;
+import cn.freemud.entities.vo.*;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -92,24 +89,25 @@ public class BatchGoodsInfoVo {
     private String couponCode;
 
     /**
-     * 买三赠一券code
-     */
-    private String buyThreeGiveOneCouponCode;
-    /**
-     * 买三赠一券活动号
-     */
-    private String buyThreeGiveOneActivityCode;
-
-    /**
      * 当前商品是否为月享卡，0:否，1:是
      */
     private int isMonthCard;
+
+    private int isB3S1Coupon;
     /**
      * 是否为月享卡商品
      */
     private int isMonthCardGoods;
     /**
+     * 是否使用了买3赠1券
+     */
+    private int isB3S1CouponGoods = 0;
+    /**
      * 月享卡加购信息
      */
     private MonthCardVo monthCardInfo;
+    /**
+     * 月享卡加购信息
+     */
+    private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;
 }

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

@@ -134,6 +134,10 @@ public class MCoffeeAddGoodsRequestVo {
      * 优惠券号
      */
     private String couponCode;
+    /**
+     * 优惠券号
+     */
+    private List<String> couponCodeList;
 
     /**
      * 套餐名称
@@ -148,9 +152,19 @@ public class MCoffeeAddGoodsRequestVo {
      * 是否为月享卡商品
      */
     private int isMonthCardGoods;
+
+    private int isB3S1Coupon;
+    /**
+     * 是否使用了买3赠1券
+     */
+    private int isB3S1CouponGoods = 0;
     /**
      * 月享卡加购信息
      */
     private MonthCardVo monthCardInfo;
+    /**
+     * 买3赠1券商品信息
+     */
+    private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;
 
 }