From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 90fd209..aa4c921 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,11 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.MgtMemberOrderPageDto;
-import com.ruoyi.order.domain.dto.MgtMemberOrderTotalDto;
-import com.ruoyi.order.domain.dto.MgtShopAllOrderPageDto;
-import com.ruoyi.order.domain.dto.MgtShopOrderPageDto;
+import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
@@ -192,4 +191,21 @@
ExcelUtil<MgtShopAllOrderPageVo> util = new ExcelUtil<MgtShopAllOrderPageVo>(MgtShopAllOrderPageVo.class);
util.exportExcel(response, shopAllOrderPageVoList, "商户订单记录");
}
+
+ //取消
+ @RequestMapping(value = "/cancelOrderBySys", method = RequestMethod.POST)
+ @Log(title = "订单管理", businessType = BusinessType.UPDATE,operContent = "取消订单")
+ @ApiOperation(value = "取消订单【2.0】")
+ public R cancelOrderBySys(@RequestBody CancelOrderDTO dto) {
+ return orderService.cancelOrderBySys(dto);
+ }
+ //退款
+ @RequestMapping(value = "/refundOrderBySys", method = RequestMethod.POST)
+ @Log(title = "订单管理", businessType = BusinessType.UPDATE,operContent = "退款")
+ @ApiOperation(value = "退款【2.0】")
+ public R refundOrderBySys(@RequestBody CancelOrderDTO dto) {
+ return orderService.refundOrderBySys(dto);
+ }
+ //todo 分页获取三方订单
+ //todo 导出三方订单
}
--
Gitblit v1.7.1