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

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

@@ -1356,6 +1356,8 @@ public class ShoppingCartMCoffeeServiceImpl {
         //设置均摊信息
         calculationService.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscount, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo, cartSendGoodsList);
 
+        shoppingCartGoodsDto.getProducts().removeIf(o -> "9998".equals(o.getSkuId()));
+
         //如果是餐具商品，则放到最后
         if (CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getProducts())) {
             int size = shoppingCartGoodsDto.getProducts().size();