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

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

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;
 
     /**
      * 是否赠品

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

@@ -2400,6 +2400,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);
+                }
             }
         }
         //优惠券满减总优惠
@@ -2659,8 +2662,13 @@ 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());
+                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/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/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())) {

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

@@ -171,6 +171,9 @@ 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())){

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

@@ -275,10 +275,6 @@ public class ShoppingCartGoodsDto {
          */
         private int isMonthCard;
         /**
-         * 是否是买3赠1券商品
-         */
-        private int isB3S1Coupon = 0;
-        /**
          * 是否为种子券商品 1:是；0:否
          */
         private int isSeedCouponGoods;
@@ -287,6 +283,14 @@ public class ShoppingCartGoodsDto {
          */
         private MonthCardVo monthCardInfo;
         /**
+         * 是否是买3赠1券商品
+         */
+        private int isB3S1Coupon = 0;
+        /**
+         * 是否使用了买3赠1券
+         */
+        private int isB3S1CouponGoods = 0;
+        /**
          * 买3赠1券信息
          */
         private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;