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

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

@@ -968,8 +968,10 @@ public class ShoppingCartMCoffeeServiceImpl {
             }
         }
         //设置更新响应信息
-        shoppingCartGoodsResponseVo.getProducts().removeIf(o -> "9998".equals(o.getSkuId()));
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.ADD_AND_UPDATE, null);
+
+        shoppingCartGoodsResponseVo.getProducts().removeIf(o -> "9998".equals(o.getSkuId()));
+
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }