From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力

---
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java
index f3391f1..ee74141 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java
@@ -32,6 +32,12 @@
      */
     void approveReturn(Long id);
 
+    /** 鍙栨秷灏氭湭鍏ュ簱鎴栭��娆剧殑鐢宠銆� */
+    void cancelReturn(Long id);
+
+    /** MES 渚у彇娑堟椂鍚屾鍥為��鍞悗宸ュ崟銆� */
+    void onMesCanceled(Long returnId);
+
     /**
      * 鑾峰緱閫�璐х敵璇�
      *
@@ -89,4 +95,7 @@
      */
     void onRefundCompleted(Long returnId, BigDecimal actualRefundPrice);
 
+    /** 纭澶栭儴閫�娆炬垨鎹㈣揣宸插畬鎴愶紝鍑瘉鍙峰繀濉�� */
+    void confirmRefundCompleted(Long returnId, BigDecimal actualRefundPrice, String voucherNo);
+
 }

--
Gitblit v1.9.3