sunyu::update::update about batchOperateGoods

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

@@ -373,26 +373,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isEmpty(requestVo.getGoodsInfos()) && CollectionUtils.isEmpty(requestVo.getQtyInfoList())) {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_INVAILD);
         }
-        BaseResponse baseResponse = new BaseResponse();
-        if (CollectionUtils.isNotEmpty(requestVo.getGoodsInfos())) {
-            MCoffeeBatchAddGoodsRequestVo addGoodsRequestVo = new MCoffeeBatchAddGoodsRequestVo();
-            addGoodsRequestVo.setAppId(requestVo.getAppId());
-            addGoodsRequestVo.setChannelType(requestVo.getChannelType());
-            addGoodsRequestVo.setMenuType(requestVo.getMenuType());
-            addGoodsRequestVo.setReceiveId(requestVo.getReceiveId());
-            addGoodsRequestVo.setSessionId(requestVo.getSessionId());
-            addGoodsRequestVo.setGoodsInfos(requestVo.getGoodsInfos());
-            addGoodsRequestVo.setShopId(requestVo.getShopId());
-            addGoodsRequestVo.setOrderType(requestVo.getOrderType());
-            addGoodsRequestVo.setPartnerId(requestVo.getPartnerId());
-            addGoodsRequestVo.setGoodsInfos(requestVo.getGoodsInfos());
-            baseResponse = this.addBatchGoods(addGoodsRequestVo);
-            //批量新增失败，直接返回错误
-            if (!Objects.equals(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {
-                return baseResponse;
-            }
-        }
-
+        BaseResponse baseResponse = null;
         if (CollectionUtils.isNotEmpty(requestVo.getQtyInfoList())) {
             BatchUpdateGoodsQtyRequestVo updateGoodsQtyRequestVo = new BatchUpdateGoodsQtyRequestVo();
             updateGoodsQtyRequestVo.setAppId(requestVo.getAppId());
@@ -411,6 +392,25 @@ public class ShoppingCartMCoffeeServiceImpl {
                 return baseResponse;
             }
         }
+
+        if (CollectionUtils.isNotEmpty(requestVo.getGoodsInfos())) {
+            MCoffeeBatchAddGoodsRequestVo addGoodsRequestVo = new MCoffeeBatchAddGoodsRequestVo();
+            addGoodsRequestVo.setAppId(requestVo.getAppId());
+            addGoodsRequestVo.setChannelType(requestVo.getChannelType());
+            addGoodsRequestVo.setMenuType(requestVo.getMenuType());
+            addGoodsRequestVo.setReceiveId(requestVo.getReceiveId());
+            addGoodsRequestVo.setSessionId(requestVo.getSessionId());
+            addGoodsRequestVo.setGoodsInfos(requestVo.getGoodsInfos());
+            addGoodsRequestVo.setShopId(requestVo.getShopId());
+            addGoodsRequestVo.setOrderType(requestVo.getOrderType());
+            addGoodsRequestVo.setPartnerId(requestVo.getPartnerId());
+            addGoodsRequestVo.setGoodsInfos(requestVo.getGoodsInfos());
+            baseResponse = this.addBatchGoods(addGoodsRequestVo);
+            //批量新增失败，直接返回错误
+            if (!Objects.equals(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {
+                return baseResponse;
+            }
+        }
         return baseResponse;
     }