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

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

@@ -878,6 +878,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
         if(isB3S1Coupon) {
             cartGoodsList = clearB3S1CouponInfo(cartGoodsList,b3S1CouponCode);
+            Optional<CartGoods> cartGoodsOptional = cartGoodsList.stream().filter(o -> "9998".equals(o.getSkuId())).findFirst();
+            if(cartGoodsOptional.isPresent()) {
+                cartGoodsOptional.get().getB3S1CouponGoodsInfo().getCardCodeSet().remove(b3S1CouponCode);
+            }
         }
 
         if(!mcCafeTablewareSkuId.equals(skuId) && finalQty == 0 && CollectionUtils.isNotEmpty(cartGoodsList) && cartGoodsList.size() == 2) {