From e2dca5a3ce717a7708d432955d3dc8d6ee800e5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:12:16 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 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 2c2a3cc..2bb8ac1 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
@@ -4,16 +4,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.model.Order;
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;
@@ -100,13 +98,13 @@
@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){
+ public R deliverGoodsRefundPass(@RequestParam("id") String id, @RequestParam("code") String code){
RefundPass refundPass = refundPassService.getById(id);
if(null == refundPass){
return R.fail();
@@ -130,23 +128,16 @@
@ResponseBody
@GetMapping("/getOrderRefundPassList")
@ApiOperation(value = "获取售后列表数据", tags = {"管理后台-售后管理", "门店后台-售后管理"})
- public TableDataInfo<OrderRefundPassList> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
- startPage();
- List<OrderRefundPassList> orderRefundPassList = refundPassService.getOrderRefundPassList(refundPassListVo);
- return getDataTable(orderRefundPassList);
+ 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