From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
index fa43bc2..fa549f4 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
@@ -3,9 +3,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.order.controller.management.dto.MgtMallOrderQuery;
import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO;
-import com.ruoyi.order.controller.management.vo.MgtMallOrderVO;
+import com.ruoyi.order.controller.management.dto.MgtOrderQuery;
+import com.ruoyi.order.controller.management.vo.MgtOrderVO;
import com.ruoyi.order.service.IOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -45,11 +45,11 @@
* @param query 商城订单查询对象
* @return PageDTO<MgtMallOrderVO>
*/
- @ApiOperation("商城订单分页列表")
- @PostMapping("/mall-page")
- public R<PageDTO<MgtMallOrderVO>> getMallOrderPage(
- @Validated @RequestBody MgtMallOrderQuery query) {
- return R.ok(orderService.getMallOrderPage(query));
+ @ApiOperation("订单分页列表")
+ @PostMapping("/page")
+ public R<PageDTO<MgtOrderVO>> getOrderPage(
+ @Validated @RequestBody MgtOrderQuery query) {
+ return R.ok(orderService.getOrderPage(query));
}
/**
@@ -60,18 +60,18 @@
*/
@ApiOperation("查看详情")
@GetMapping("/detail/{id}")
- public R<MgtMallOrderVO> getMallOrderDetail(
+ public R<MgtOrderVO> getMallOrderDetail(
@ApiParam(name = "id", value = "订单id", required = true)
- @Validated @RequestBody Long id) {
- return R.ok(orderService.getMallOrderDetail(id));
+ @Validated @PathVariable("id") Long id) {
+ return R.ok(orderService.getOrderDetail(id));
}
/**
* 确认发货
*
- * @param dto 确认收货请求对象
+ * @param dto 确认发货请求对象
*/
- @ApiOperation("确认收货")
+ @ApiOperation("确认发货")
@PutMapping("/confirm-shipment")
public R<?> confirmShipmentOrder(@Validated @RequestBody MgtOrderConfirmShipmentDTO dto) {
orderService.confirmShipmentOrder(dto);
@@ -90,4 +90,43 @@
orderService.receivedGoods(id);
return R.ok();
}
+
+ /**
+ * 退款
+ *
+ * @param id 订单id
+ */
+ @ApiOperation("退款")
+ @GetMapping("/refund/{id}")
+ public R<?> refund(
+ @ApiParam(name = "id", value = "订单id", required = true) @PathVariable("id") Long id) {
+ orderService.refund(id);
+ return R.ok();
+ }
+
+ /**
+ * 退款退货
+ *
+ * @param id 订单id
+ */
+ @ApiOperation("退款退货")
+ @GetMapping("/refund-return/{id}")
+ public R<?> refundReturn(
+ @ApiParam(name = "id", value = "订单id", required = true) @PathVariable("id") Long id) {
+ orderService.refundReturn(id);
+ return R.ok();
+ }
+
+ /**
+ * 拍卖订单退保证金
+ *
+ * @param id 订单id
+ */
+ @ApiOperation("拍卖订单退保证金")
+ @PutMapping("/refund-bond/{id}")
+ public R<?> refundBond(
+ @ApiParam(name = "id", value = "订单id", required = true) @PathVariable("id") Long id) {
+ orderService.refundBond(id);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1