Commit 94af7352 by 孙昱

sunyu::update::update about batchOperateCartGoods

parent 036acadf
...@@ -39,7 +39,6 @@ public class BatchOperateCartGoodsRequestVo extends BaseRequestVo{ ...@@ -39,7 +39,6 @@ public class BatchOperateCartGoodsRequestVo extends BaseRequestVo{
/** /**
* 商品信息 * 商品信息
*/ */
@NotEmpty(message = "商品信息不可为空")
private List<BatchGoodsInfoVo> goodsInfos; private List<BatchGoodsInfoVo> goodsInfos;
} }
\ No newline at end of file
...@@ -370,46 +370,45 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -370,46 +370,45 @@ public class ShoppingCartMCoffeeServiceImpl {
if (StringUtils.isEmpty(requestVo.getShopId())) { if (StringUtils.isEmpty(requestVo.getShopId())) {
throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY); 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); return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_INVAILD);
} }
if (CollectionUtils.isEmpty(requestVo.getQtyInfoList())){ BaseResponse baseResponse = new BaseResponse();
return ResponseUtil.error(ResponseResult.SHOPPING_CART_UPDATE_ERROR); 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;
}
} }
if (CollectionUtils.isNotEmpty(requestVo.getGoodsInfos())) {
BaseResponse baseResponse; MCoffeeBatchAddGoodsRequestVo addGoodsRequestVo = new MCoffeeBatchAddGoodsRequestVo();
BatchUpdateGoodsQtyRequestVo updateGoodsQtyRequestVo = new BatchUpdateGoodsQtyRequestVo(); addGoodsRequestVo.setAppId(requestVo.getAppId());
updateGoodsQtyRequestVo.setAppId(requestVo.getAppId()); addGoodsRequestVo.setChannelType(requestVo.getChannelType());
updateGoodsQtyRequestVo.setChannelType(requestVo.getChannelType()); addGoodsRequestVo.setMenuType(requestVo.getMenuType());
updateGoodsQtyRequestVo.setCarVer(requestVo.getCarVer()); addGoodsRequestVo.setReceiveId(requestVo.getReceiveId());
updateGoodsQtyRequestVo.setMenuType(requestVo.getMenuType()); addGoodsRequestVo.setSessionId(requestVo.getSessionId());
updateGoodsQtyRequestVo.setReceiveId(requestVo.getReceiveId()); addGoodsRequestVo.setGoodsInfos(requestVo.getGoodsInfos());
updateGoodsQtyRequestVo.setSessionId(requestVo.getSessionId()); addGoodsRequestVo.setShopId(requestVo.getShopId());
updateGoodsQtyRequestVo.setVersion(requestVo.getVersion()); addGoodsRequestVo.setOrderType(requestVo.getOrderType());
updateGoodsQtyRequestVo.setShopId(requestVo.getShopId()); addGoodsRequestVo.setPartnerId(requestVo.getPartnerId());
updateGoodsQtyRequestVo.setPartnerId(requestVo.getPartnerId()); addGoodsRequestVo.setGoodsInfos(requestVo.getGoodsInfos());
updateGoodsQtyRequestVo.setQtyInfoList(requestVo.getQtyInfoList()); baseResponse = this.addBatchGoods(addGoodsRequestVo);
baseResponse = this.batchUpdateGoodsQty(updateGoodsQtyRequestVo); //批量新增失败,直接返回错误
//批量更新失败,直接返回错误 if (!Objects.equals(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {
if (!Objects.equals(ResponseResult.SUCCESS.getCode(),baseResponse.getCode())){ return baseResponse;
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;
} }
return baseResponse; return baseResponse;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment