Merge branch 'feature-yu.sun-20200915-new' into qa

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

@@ -554,8 +554,17 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return ResponseUtil.success(shoppingCartGoodsResponseVo);
         }
-        // 新门店check购物车中所有商品
-        cartGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+
+        List<CartGoods> onlyCheckGoodsList = new ArrayList<>();
+        if (requestVo.getOperationType() == ShoppingCartOperationType.UPDATE3.getCode()){
+            onlyCheckGoodsList.addAll(cartGoodsList);
+            // 新门店check购物车中所有商品
+            onlyCheckGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, onlyCheckGoodsList);
+        }else{
+            // 新门店check购物车中所有商品
+            cartGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+        }
+
         if (requestVo.getOperationType() == ShoppingCartOperationType.UPDATE3.getCode()) {
             if (StringUtils.isNotEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
                 //设置更新响应信息