From 49f2eff2cf52e0f1719dfad43cafff11b378252c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 十二月 2024 18:14:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index e418051..6affa54 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -11,10 +11,7 @@
import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.RefundPassService;
-import com.ruoyi.order.vo.ApplyRefundPass;
-import com.ruoyi.order.vo.OrderRefundPassList;
-import com.ruoyi.order.vo.OrderRefundPassListVo;
-import com.ruoyi.order.vo.RefundPassInfo;
+import com.ruoyi.order.vo.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -137,15 +134,10 @@
@ResponseBody
- @PostMapping("/authPassStatus/{id}/{status}")
+ @PostMapping("/authPassStatus")
@ApiOperation(value = "审核售后", tags = {"管理后台-售后管理", "门店后台-售后管理"})
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
- @ApiImplicitParam(name = "status", value = "审核状态（2=同意，3=拒绝）", required = true, dataType = "int"),
- @ApiImplicitParam(name = "passRemark", value = "审核备注", required = false, dataType = "string"),
- })
- public R authPassStatus(@PathVariable("id") Long id, @PathVariable("status") Integer status, @RequestParam("passRemark") String passRemark){
- return refundPassService.authPassStatus(id, status, passRemark);
+ public R authPassStatus(@RequestBody AuthPassStatus authPassStatus){
+ return refundPassService.authPassStatus(authPassStatus.getId(), authPassStatus.getStatus(), authPassStatus.getPassRemark());
}
--
Gitblit v1.7.1