From 29c9ada64cee7adf3399e92ee3a62f2b9ed338ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 10:19:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 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..e139ff9 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;
@@ -22,6 +19,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -101,14 +99,14 @@
@ResponseBody
- @PutMapping("/deliverGoodsRefundPass/{id}/{code}")
+ @PostMapping("/deliverGoodsRefundPass")
@ApiOperation(value = "售后已发货操作", tags = {"我的订单-个人中心-小程序"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
@ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string"),
})
- public R deliverGoodsRefundPass(@PathVariable("id") Long id, @PathVariable("code") String code){
- RefundPass refundPass = refundPassService.getById(id);
+ public R deliverGoodsRefundPass(@RequestBody DeliverGoodsRefundPass pass){
+ RefundPass refundPass = refundPassService.getById(pass.getId());
if(null == refundPass){
return R.fail();
}
@@ -121,7 +119,7 @@
return R.fail("操作失败");
}
refundPass.setStatus(5);
- refundPass.setCode(code);
+ refundPass.setCode(pass.getCode());
refundPassService.updateById(refundPass);
return R.ok();
}
@@ -134,18 +132,14 @@
public R<PageInfo<OrderRefundPassList>> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
return R.ok(refundPassService.getOrderRefundPassList(refundPassListVo));
}
-
+
+
@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