Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into…

Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into feature/xukang_20210609_麦咖啡p7v2

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

@@ -1904,7 +1904,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         cartGoods.setIsMonthCard(addShoppingCartGoodsRequestVo.getIsMonthCard());
         cartGoods.setIsB3S1Coupon(addShoppingCartGoodsRequestVo.getIsB3S1Coupon());
         cartGoods.setIsMonthCardGoods(addShoppingCartGoodsRequestVo.getIsMonthCardGoods());
-        cartGoods.setIsB3S1CouponGoods(addShoppingCartGoodsRequestVo.getIsB3S1Coupon());
+        cartGoods.setIsB3S1CouponGoods(0);
         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())) {
@@ -2533,6 +2533,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         mCoffeeAddGoodsRequestVo.setIsB3S1Coupon(goodsInfo.getIsB3S1Coupon());
         mCoffeeAddGoodsRequestVo.setIsMonthCardGoods(goodsInfo.getIsMonthCardGoods());
         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

 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;
 
@@ -105,4 +102,8 @@ public class BatchGoodsInfoVo {
      * 月享卡加购信息
      */
     private MonthCardVo monthCardInfo;
+    /**
+     * 月享卡加购信息
+     */
+    private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;
 }