Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into…

Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into feature/xukang_20210609_麦咖啡p7v2

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

@@ -232,7 +232,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 assortmentSdkService.setShoppingCart(partnerId, storeId, userId, oldCartGoodsList, null, tableNumber, this.shoppingCartBaseService);
                 newCartGoods = oldCartGoodsList;
             } 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()) {
                     cartGoods.get().getB3S1CouponGoodsInfo().getCardCodeSet().add(addCartGoods.getCouponCode());
                 } else {
@@ -813,6 +813,9 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.ADD_AND_UPDATE, null);
+
+        shoppingCartGoodsResponseVo.getProducts().removeIf(o -> "9998".equals(o.getSkuId()));
+
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }