From 63b7c2cf029bf1c54194df85aea4816f7c76c939 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期四, 19 十月 2023 16:33:43 +0800 Subject: [PATCH] #路径拼接 --- server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 9 +++++---- 1 files changed, 5 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 7061f5e..facb6c4 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; @@ -126,8 +127,8 @@ @ApiOperation("寮哄埗缁撶畻璁㈠崟") @PostMapping("/closerGoodsorder") @RequiresPermissions("business:goodsorder:query") - public ApiResponse closerGoodsorder(@RequestParam String id){ - goodsorderService.closerGoodsorder(id); + public ApiResponse closerGoodsorder(@RequestBody Goodsorder goodsorder){ + goodsorderService.forceCloseGoodsorder(goodsorder.getId()); return ApiResponse.success(null); } @@ -136,12 +137,12 @@ @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") + @GetMapping("/getGoodsorderCanBanlanceDTO") @RequiresPermissions("business:goodsorder:query") public ApiResponse<GoodsorderCanBanlanceDTO> getGoodsorderCanBanlanceDTO(@RequestParam String orderId){ return ApiResponse.success(goodsorderService.getGoodsorderCanBanlanceDTO(orderId)); -- Gitblit v1.9.3