Commit 16abb6a5 by 徐康

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

parents 6c016d19 6d1b6c8e
...@@ -246,7 +246,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -246,7 +246,7 @@ public class ShoppingCartMCoffeeServiceImpl {
assortmentSdkService.setShoppingCart(partnerId, storeId, userId, oldCartGoodsList, null, tableNumber, this.shoppingCartBaseService); assortmentSdkService.setShoppingCart(partnerId, storeId, userId, oldCartGoodsList, null, tableNumber, this.shoppingCartBaseService);
newCartGoods = oldCartGoodsList; newCartGoods = oldCartGoodsList;
} else if(StringUtils.equals("9998",skuId)){ } else if(StringUtils.equals("9998",skuId)){
Optional<CartGoods> cartGoods = oldCartGoodsList.stream().filter(o -> "9998".equals(o.getSkuId()) && o.getIsB3S1Coupon() == 1).findFirst(); Optional<CartGoods> cartGoods = oldCartGoodsList.stream().filter(o -> "9998".equals(o.getSkuId())).findFirst();
if(cartGoods.isPresent()) { if(cartGoods.isPresent()) {
cartGoods.get().getB3S1CouponGoodsInfo().getCardCodeSet().add(addCartGoods.getCouponCode()); cartGoods.get().getB3S1CouponGoodsInfo().getCardCodeSet().add(addCartGoods.getCouponCode());
} else { } else {
......
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