From b1c1c20ef382dd2be0f6bdf81f5d2913e749faef Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 12 十月 2023 11:12:02 +0800 Subject: [PATCH] 整理接口 --- server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java index 238304a..a74c621 100644 --- a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java +++ b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java @@ -3,6 +3,7 @@ import com.doumee.api.BaseController; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; +import com.doumee.core.constants.Constants; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; @@ -12,6 +13,7 @@ import com.doumee.dao.business.vo.GoodsorderExportVO; import com.doumee.dao.business.vo.GoodsorderTotalDataVO; import com.doumee.dao.business.web.request.GoodsorderBackDTO; +import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO; import com.doumee.dao.business.web.response.GoodsorderDetailDTO; import com.doumee.service.business.GoodsorderService; import com.doumee.service.business.GoodsorderService; @@ -122,20 +124,27 @@ * @param id * @return */ - @ApiOperation("鏍规嵁ID鏌ヨ") + @ApiOperation("寮哄埗缁撶畻璁㈠崟") @PostMapping("/closerGoodsorder") @RequiresPermissions("business:goodsorder:query") public ApiResponse closerGoodsorder(@RequestParam String id){ - goodsorderService.closerGoodsorder(id); + goodsorderService.forceCloseGoodsorder(id); return ApiResponse.success(null); } - @ApiOperation("鏍规嵁ID鏌ヨ") + @ApiOperation("閫�娆�") @PostMapping("/backGoodsorder") @RequiresPermissions("business:goodsorder:query") public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO){ - goodsorderService.backGoodsorder(goodsorderBackDTO.getOrderId(),goodsorderBackDTO.getMoney()); + goodsorderService.backGoodsorder(goodsorderBackDTO.getOrderId(),goodsorderBackDTO.getMoney(),goodsorderBackDTO.getReason()); return ApiResponse.success(null); } + + @ApiOperation("鑾峰彇鍙��娆句俊鎭�") + @PostMapping("/getGoodsorderCanBanlanceDTO") + @RequiresPermissions("business:goodsorder:query") + public ApiResponse<GoodsorderCanBanlanceDTO> getGoodsorderCanBanlanceDTO(@RequestParam String orderId){ + return ApiResponse.success(goodsorderService.getGoodsorderCanBanlanceDTO(orderId)); + } } -- Gitblit v1.9.3