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

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java

@@ -22,6 +22,7 @@ public enum GoodsTypeEnum {
     SKU_GOODS(4, "sku商品"),
     SPU_GOODS(5, "spu商品"),
     REDUCE_PRICE_GOODS(6,"超值加购商品"),
+    ALL_COUPON_GOODS(8, "万能券商品"),
     MATERIAL(88, "有加料的商品"),
     EXCEPTION_GOODS(99, "异常商品:商品菜单变化导致和购物车不商品匹配");
     private Integer goodsType;

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.ALL_COUPON_GOODS.getGoodsType();
         }
         if (addShoppingCartGoodsRequestVo.getOperationType() != null && addShoppingCartGoodsRequestVo.getOperationType() == 2) {
             goodsType = GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType();