Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa

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

@@ -843,6 +843,14 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return ResponseUtil.success(shoppingCartGoodsResponseVo);
+        } else {
+            //移除餐具商品
+            for(int i=0;i<cartGoodsList.size();i++) {
+                if(mcCafeTablewareSkuId.equals(cartGoodsList.get(i).getSkuId())) {
+                    cartGoodsList.remove(i);
+                    break;
+                }
+            }
         }
 
         List<CartGoods> onlyCheckGoodsList = new ArrayList<>();