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

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

@@ -556,20 +556,21 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         List<CartGoods> onlyCheckGoodsList = new ArrayList<>();
-        ShoppingCartGoodsResponseVo onlyCheckResponseVo = new ShoppingCartGoodsResponseVo();
         if (requestVo.getOperationType() == ShoppingCartOperationType.UPDATE3.getCode()){
             onlyCheckGoodsList.addAll(cartGoodsList);
             // 新门店check购物车中所有商品
-            onlyCheckGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, onlyCheckResponseVo, onlyCheckGoodsList);
+            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(onlyCheckResponseVo.getToastMsg())){
-                //设置更新响应信息
-                setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, onlyCheckResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
+            if (StringUtils.isNotEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
+                //设置更新响应信息,校验失败只弹框提示消息，不切换门店，故将门店id重置为原来门店
+                shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
+                shoppingCartInfoRequestVo.setShopId(requestVo.getFromShopId());
+                setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
                 return ResponseUtil.success(shoppingCartGoodsResponseVo);
             }
         }