Merge branch 'bugfix/20201203_xukang_麦咖啡线上问题修复' into qa

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

@@ -270,8 +270,10 @@ public class ShoppingCartMCoffeeServiceImpl {
                     isContinue= false;
                 }
                 if(StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
-                        && cartGoods.getName().equals("啡常搭") && CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1
-                        && CollectionUtils.isEmpty(cartGoods.getProductGroupList()) && cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId)) {
+                        && (cartGoods.getName().equals("拿铁") || cartGoods.getName().equals("美式")) && cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType())
+                        && CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1
+                        && cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId)
+                        && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
                     // 如果购物车商品存在商品规格，替换时复制规格信息
                     if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList().get(0).getSpecialExtra())) {
                         addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getProductComboList().get(0).getSpecialExtra());