Merge branch '2020/09/24-运费券-huiyang' into qa

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/CommonsConstant.java

@@ -18,4 +18,6 @@ public class CommonsConstant {
 
     public final static Integer WEIGHT_PRODUCT = 1;
 
+    public final static Integer COUPON_TYPE = 1;
+
 }

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

@@ -1150,6 +1150,8 @@ public class ShoppingCartMCoffeeServiceImpl {
 //            cartGoods.setCartGoodsUid(spuId);
         } else if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList()) || CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductGroupList())) {
             goodsType = GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType();
+        }else if (CommonsConstant.COUPON_TYPE == addShoppingCartGoodsRequestVo.getCouponType()){
+            goodsType = GoodsTypeEnum.COUPON_GOODS.getGoodsType();
         }
         if (addShoppingCartGoodsRequestVo.getOperationType() != null && addShoppingCartGoodsRequestVo.getOperationType() == 2) {
             goodsType = GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType();

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

@@ -119,6 +119,11 @@ public class MCoffeeAddGoodsRequestVo {
     private Integer operationType;
 
     /**
+     * 券类型 0：商品券
+     */
+    private Integer couponType;
+
+    /**
      * 优惠券号
      */
     private String couponCode;