Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa

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

@@ -464,7 +464,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             Boolean isContinue =true;
             for (CartGoods cartGoods : oldCartGoodsList) {
                 //购物车已存在商品券
-                if (StringUtils.isNotBlank(cartGoods.getCouponCode())) {
+                if (StringUtils.isNotBlank(cartGoods.getCouponCode()) && cartGoods.getIsB3S1CouponGoods() != 1) {
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                     calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
                     coupons.add(calculationDiscountCoupon);
@@ -2014,7 +2014,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         cartGoods.setIsMonthCard(addShoppingCartGoodsRequestVo.getIsMonthCard());
         cartGoods.setIsB3S1Coupon(addShoppingCartGoodsRequestVo.getIsB3S1Coupon());
         cartGoods.setIsMonthCardGoods(addShoppingCartGoodsRequestVo.getIsMonthCardGoods());
-        cartGoods.setIsB3S1CouponGoods(0);
+        cartGoods.setIsB3S1CouponGoods(addShoppingCartGoodsRequestVo.getIsB3S1CouponGoods());
         cartGoods.setCouponCode(addShoppingCartGoodsRequestVo.getCouponCode());
         Integer goodsType = StringUtils.isEmpty(skuId) || ObjectUtils.equals(spuId, skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
         if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList()) || CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductGroupList())) {
@@ -2248,7 +2248,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             for (CartGoods cartGoods : cartGoodsList) {
                 //购物车已存在商品券
                 if (null != cartGoods) {
-                    if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
+                    if (StringUtils.isNotEmpty(cartGoods.getCouponCode()) && cartGoods.getIsB3S1CouponGoods() != 1) {
                         ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                         calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
                         coupons.add(calculationDiscountCoupon);
@@ -2650,6 +2650,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         mCoffeeAddGoodsRequestVo.setIsMonthCard(goodsInfo.getIsMonthCard());
         mCoffeeAddGoodsRequestVo.setIsB3S1Coupon(goodsInfo.getIsB3S1Coupon());
         mCoffeeAddGoodsRequestVo.setIsMonthCardGoods(goodsInfo.getIsMonthCardGoods());
+        mCoffeeAddGoodsRequestVo.setIsB3S1CouponGoods(goodsInfo.getIsB3S1CouponGoods());
         mCoffeeAddGoodsRequestVo.setMonthCardInfo(goodsInfo.getMonthCardInfo());
         mCoffeeAddGoodsRequestVo.setB3S1CouponGoodsInfo(goodsInfo.getB3S1CouponGoodsInfo());
         return mCoffeeAddGoodsRequestVo;

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

@@ -99,6 +99,10 @@ public class BatchGoodsInfoVo {
      */
     private int isMonthCardGoods;
     /**
+     * 是否使用了买3赠1券
+     */
+    private int isB3S1CouponGoods = 0;
+    /**
      * 月享卡加购信息
      */
     private MonthCardVo monthCardInfo;

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

@@ -155,6 +155,10 @@ public class MCoffeeAddGoodsRequestVo {
 
     private int isB3S1Coupon;
     /**
+     * 是否使用了买3赠1券
+     */
+    private int isB3S1CouponGoods = 0;
+    /**
      * 月享卡加购信息
      */
     private MonthCardVo monthCardInfo;