From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb

---
 oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java b/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java
index bdab037..f8f1c9e 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java
@@ -7,6 +7,9 @@
 import javax.servlet.http.HttpServletResponse;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.oying.modules.sh.domain.request.AuditOrderReturn;
+import com.oying.modules.sh.domain.request.ReturnOrder;
+import com.oying.modules.sh.domain.vo.OrderReturnResponse;
 import com.oying.utils.PageResult;
 
 /**
@@ -35,19 +38,16 @@
     * 创建
     * @param resources /
     */
-    void create(OrderReturn resources);
+    void create(ReturnOrder resources);
+
+
+    void cancel(String returnNum);
 
     /**
     * 编辑
     * @param resources /
     */
     void update(OrderReturn resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(List<Long> ids);
 
     /**
     * 导出数据
@@ -57,7 +57,9 @@
     */
     void download(List<OrderReturn> all, HttpServletResponse response) throws IOException;
 
-    OrderReturn getByReturnNum(String outRefundNo);
+    OrderReturnResponse getByReturnNum(String outRefundNo);
 
-    void updatePayStatus(String outRefundNo, String status, String time);
+    void updatePayStatus(String outRefundNo, String refundStatus, String successTime);
+
+    void audit(AuditOrderReturn resources);
 }

--
Gitblit v1.9.3