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

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

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

@@ -3204,13 +3204,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/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;
 }

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

@@ -2662,6 +2662,8 @@ public class OrderAdapter {
                 });
                 createOrderProductDemoDto.setComboProduct(comboProducts);
             } else if(ProductTypeEnum.VIRTUAL_PRODUCT.getCode().equals(cartGoodsDetailDto.getProductType())) {
+                createOrderProductDemoDto.setIsMonthCard(cartGoodsDetailDto.getIsMonthCard());
+                createOrderProductDemoDto.setIsB3S1Coupon(cartGoodsDetailDto.getIsB3S1Coupon());
                 if(cartGoodsDetailDto.getIsMonthCard() == 1) {
                     createOrderProductDemoDto.setCardId(cartGoodsDetailDto.getMonthCardInfo().getCardNo());
                     createOrderProductDemoDto.setCardCode(cartGoodsDetailDto.getMonthCardInfo().getCardCode());

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

@@ -275,10 +275,6 @@ public class ShoppingCartGoodsDto {
          */
         private int isMonthCard;
         /**
-         * 是否为种子券商品 1:是；0:否
-         */
-        private int isSeedCouponGoods;
-        /**
          * 月享卡信息
          */
         private MonthCardVo monthCardInfo;

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

@@ -997,7 +997,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<CartGoods> cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
         ApiLog.debug("cartSendGoodsList: {}",JSONObject.toJSONString(cartSendGoodsList));
         CartGoods monthCardProduct = null;
-        CartGoods B3S1CouponProduct = null;
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
             // check购物车中所有商品
@@ -1013,19 +1012,12 @@ public class ShoppingCartMCoffeeServiceImpl {
                     monthCardProduct = goods;
                     continue;
                 }
-                if (StringUtils.equals(goods.getSkuId(),"9998")){
-                    B3S1CouponProduct = goods;
-                    continue;
-                }
                 temList.add(goods);
             }
             cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, temList, sessionId);
             if (null != monthCardProduct) {
                 cartGoodsList.add(monthCardProduct);
             }
-            if (null != B3S1CouponProduct) {
-                cartGoodsList.add(B3S1CouponProduct);
-            }
 
             if (CollectionUtils.isNotEmpty(cartGoodsList)) {
                 int size = cartGoodsList.size();