From 6e936cc4af80fa65210d7e00a54e89a9e706305d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 18:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 6 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 2085ad3..2c2a3cc 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
@@ -3,12 +3,17 @@
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.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 io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +21,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -27,7 +33,7 @@
*/
@RestController
@RequestMapping("/refund-pass")
-public class RefundPassController {
+public class RefundPassController extends BaseController {
@Resource
@@ -60,7 +66,7 @@
return R.fail("权限不足");
}
RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
- .eq(RefundPass::getDelFlag, 0).last(" order by createTime desc limit 0,1"));
+ .eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
one.setIdStr(one.getId().toString());
return R.ok(one);
}
@@ -85,8 +91,8 @@
if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
return R.fail("售后取消失败");
}
- refundPass.setDelFlag(1);
- refundPassService.updateById(refundPass);
+// refundPass.setDelFlag(1);
+ refundPassService.removeById(id);
order.setOrderStatus(4);
orderService.updateById(order);
return R.ok();
@@ -94,12 +100,13 @@
@ResponseBody
- @PutMapping("/deliverGoodsRefundPass/{id}")
+ @PutMapping("/deliverGoodsRefundPass/{id}/{code}")
@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){
+ public R deliverGoodsRefundPass(@PathVariable("id") Long id, @PathVariable("code") String code){
RefundPass refundPass = refundPassService.getById(id);
if(null == refundPass){
return R.fail();
@@ -113,9 +120,59 @@
return R.fail("操作失败");
}
refundPass.setStatus(5);
+ refundPass.setCode(code);
refundPassService.updateById(refundPass);
return R.ok();
}
+
+
+ @ResponseBody
+ @GetMapping("/getOrderRefundPassList")
+ @ApiOperation(value = "获取售后列表数据", tags = {"管理后台-售后管理", "门店后台-售后管理"})
+ public TableDataInfo<OrderRefundPassList> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
+ startPage();
+ List<OrderRefundPassList> orderRefundPassList = refundPassService.getOrderRefundPassList(refundPassListVo);
+ return getDataTable(orderRefundPassList);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/authPassStatus/{id}/{status}")
+ @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);
+ }
+
+
+ @ResponseBody
+ @PutMapping("/refundPassReceive/{id}")
+ @ApiOperation(value = "售后确认收货操作", tags = {"管理后台-售后管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ })
+ public R refundPassReceive(@PathVariable("id") Long id){
+ return refundPassService.refundPassReceive(id);
+ }
+
+
+
+ @ResponseBody
+ @GetMapping("/getRefundPassInfo/{id}")
+ @ApiOperation(value = "获取售后数据详情", tags = {"管理后台-售后管理", "门店后台-售后管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ })
+ public R<RefundPassInfo> getRefundPassInfo(@PathVariable("id") Long id){
+ RefundPassInfo refundPassInfo = refundPassService.getRefundPassInfo(id);
+ return R.ok(refundPassInfo);
+ }
+
+
}
--
Gitblit v1.7.1