From 6a48d04a36bc459ed761d787ee3d537652185d36 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 27 十月 2026 15:06:50 +0800
Subject: [PATCH] refactor(permission): 清理新高电力查询菜单及权限注解

---
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java
index 68ff1d0..b4e4c48 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java
@@ -7,6 +7,7 @@
 import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleReturnPageReqVO;
 import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleReturnRespVO;
 import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleReturnSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleRefundConfirmReqVO;
 import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
 import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnItemDO;
 import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
@@ -60,10 +61,25 @@
         return success(true);
     }
 
+    @PutMapping("/complete-refund")
+    @Operation(summary = "纭澶栭儴閫�娆�/鎹㈣揣瀹屾垚")
+    @PreAuthorize("@ss.hasPermission('aftersales:return:refund')")
+    public CommonResult<Boolean> completeRefund(@Valid @RequestBody AfterSaleRefundConfirmReqVO reqVO) {
+        returnService.confirmRefundCompleted(reqVO.getId(), reqVO.getActualRefundPrice(), reqVO.getVoucherNo());
+        return success(true);
+    }
+
+    @PutMapping("/cancel")
+    @Operation(summary = "鍙栨秷灏氭湭鍏ュ簱鎴栭��娆剧殑閫�璐х敵璇�")
+    @PreAuthorize("@ss.hasPermission('aftersales:return:cancel')")
+    public CommonResult<Boolean> cancelReturn(@RequestParam("id") Long id) {
+        returnService.cancelReturn(id);
+        return success(true);
+    }
+
     @GetMapping("/get")
     @Operation(summary = "鑾峰緱閫�璐х敵璇�")
     @Parameter(name = "id", description = "閫�璐х敵璇风紪鍙�", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('aftersales:return:query')")
     public CommonResult<AfterSaleReturnRespVO> getReturn(@RequestParam("id") Long id) {
         AfterSaleReturnDO returnDO = returnService.getReturn(id);
         List<AfterSaleReturnItemDO> items = returnService.getReturnItemListByReturnId(id);
@@ -75,7 +91,6 @@
 
     @GetMapping("/page")
     @Operation(summary = "鑾峰緱閫�璐х敵璇峰垎椤�")
-    @PreAuthorize("@ss.hasPermission('aftersales:return:query')")
     public CommonResult<PageResult<AfterSaleReturnRespVO>> getReturnPage(@Valid AfterSaleReturnPageReqVO pageReqVO) {
         PageResult<AfterSaleReturnDO> pageResult = returnService.getReturnPage(pageReqVO, getLoginUserId());
         List<AfterSaleReturnRespVO> list = buildReturnDetailList(pageResult.getList());

--
Gitblit v1.9.3