Skip to content

O
order-group
Commit 7354986d by 徐康
Options

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

parents d6596e9b 6fffa32f
Showing with 1 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
...@@ -270,7 +270,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -270,7 +270,7 @@ public class ShoppingCartMCoffeeServiceImpl {
isContinue= false; isContinue= false;
} }
if(StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue if(StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
&& (cartGoods.getName().equals("拿铁") || cartGoods.getName().equals("美式")) && cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType()) && cartGoods.getName().equals("啡常搭") && cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType())
&& CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1 && CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1
&& cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId) && cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId)
&& CollectionUtils.isEmpty(cartGoods.getProductGroupList())) { && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment