sunyu::update::update about batchOperateCartGoods

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/BatchOperateCartGoodsRequestVo.java

@@ -39,7 +39,6 @@ public class BatchOperateCartGoodsRequestVo extends BaseRequestVo{
     /**
      * 商品信息
      */
-    @NotEmpty(message = "商品信息不可为空")
     private List<BatchGoodsInfoVo> goodsInfos;
 
 }
\ No newline at end of file

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

@@ -370,46 +370,45 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (StringUtils.isEmpty(requestVo.getShopId())) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
         }
-        if (CollectionUtils.isEmpty(requestVo.getGoodsInfos())) {
+        if (CollectionUtils.isEmpty(requestVo.getGoodsInfos()) && CollectionUtils.isEmpty(requestVo.getQtyInfoList())) {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_INVAILD);
         }
-        if (CollectionUtils.isEmpty(requestVo.getQtyInfoList())){
-            return ResponseUtil.error(ResponseResult.SHOPPING_CART_UPDATE_ERROR);
+        BaseResponse baseResponse = new BaseResponse();
+        if (CollectionUtils.isNotEmpty(requestVo.getQtyInfoList())) {
+            BatchUpdateGoodsQtyRequestVo updateGoodsQtyRequestVo = new BatchUpdateGoodsQtyRequestVo();
+            updateGoodsQtyRequestVo.setAppId(requestVo.getAppId());
+            updateGoodsQtyRequestVo.setChannelType(requestVo.getChannelType());
+            updateGoodsQtyRequestVo.setCarVer(requestVo.getCarVer());
+            updateGoodsQtyRequestVo.setMenuType(requestVo.getMenuType());
+            updateGoodsQtyRequestVo.setReceiveId(requestVo.getReceiveId());
+            updateGoodsQtyRequestVo.setSessionId(requestVo.getSessionId());
+            updateGoodsQtyRequestVo.setVersion(requestVo.getVersion());
+            updateGoodsQtyRequestVo.setShopId(requestVo.getShopId());
+            updateGoodsQtyRequestVo.setPartnerId(requestVo.getPartnerId());
+            updateGoodsQtyRequestVo.setQtyInfoList(requestVo.getQtyInfoList());
+            baseResponse = this.batchUpdateGoodsQty(updateGoodsQtyRequestVo);
+            //批量更新失败，直接返回错误
+            if (!Objects.equals(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {
+                return baseResponse;
+            }
         }
-
-        BaseResponse baseResponse;
-        BatchUpdateGoodsQtyRequestVo updateGoodsQtyRequestVo = new BatchUpdateGoodsQtyRequestVo();
-        updateGoodsQtyRequestVo.setAppId(requestVo.getAppId());
-        updateGoodsQtyRequestVo.setChannelType(requestVo.getChannelType());
-        updateGoodsQtyRequestVo.setCarVer(requestVo.getCarVer());
-        updateGoodsQtyRequestVo.setMenuType(requestVo.getMenuType());
-        updateGoodsQtyRequestVo.setReceiveId(requestVo.getReceiveId());
-        updateGoodsQtyRequestVo.setSessionId(requestVo.getSessionId());
-        updateGoodsQtyRequestVo.setVersion(requestVo.getVersion());
-        updateGoodsQtyRequestVo.setShopId(requestVo.getShopId());
-        updateGoodsQtyRequestVo.setPartnerId(requestVo.getPartnerId());
-        updateGoodsQtyRequestVo.setQtyInfoList(requestVo.getQtyInfoList());
-        baseResponse = this.batchUpdateGoodsQty(updateGoodsQtyRequestVo);
-        //批量更新失败，直接返回错误
-        if (!Objects.equals(ResponseResult.SUCCESS.getCode(),baseResponse.getCode())){
-            return baseResponse;
-        }
-
-        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;
+        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;
     }