Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-18 dbd141aa06a85255117ebeb812a0fc4a8ef541f2

 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);
    }

@@ -141,7 +142,7 @@
    }

    @ApiOperation("获取可退款信息")
    @PostMapping("/getGoodsorderCanBanlanceDTO")
    @GetMapping("/getGoodsorderCanBanlanceDTO")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse<GoodsorderCanBanlanceDTO> getGoodsorderCanBanlanceDTO(@RequestParam String orderId){
        return ApiResponse.success(goodsorderService.getGoodsorderCanBanlanceDTO(orderId));