From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java |   43 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java b/server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java
index 53ebbc0..679f4b8 100644
--- a/server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java
+++ b/server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java
@@ -3,20 +3,21 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.WithdrawalOrders;
+import com.doumee.dao.dto.WithdrawalApproveDTO;
 import com.doumee.dao.dto.WithdrawalDTO;
 
 import java.util.List;
 
 /**
  * 鎻愮幇鐢宠璁板綍Service瀹氫箟
- * @author 姹熻箘韫�
- * @date 2025/07/09 12:00
+ * @author rk
+ * @date 2026/04/10
  */
 public interface WithdrawalOrdersService {
 
     /**
      * 鍒涘缓
-     * 
+     *
      * @param withdrawalOrders 瀹炰綋瀵硅薄
      * @return Integer
      */
@@ -53,9 +54,9 @@
     /**
      * 鎵归噺涓婚敭鏇存柊
      *
-     * @param withdrawalOrderss 瀹炰綋闆�
+     * @param withdrawalOrdersList 瀹炰綋闆�
      */
-    void updateByIdInBatch(List<WithdrawalOrders> withdrawalOrderss);
+    void updateByIdInBatch(List<WithdrawalOrders> withdrawalOrdersList);
 
     /**
      * 涓婚敭鏌ヨ
@@ -80,7 +81,7 @@
      * @return List<WithdrawalOrders>
      */
     List<WithdrawalOrders> findList(WithdrawalOrders withdrawalOrders);
-  
+
     /**
      * 鍒嗛〉鏌ヨ
      *
@@ -97,7 +98,35 @@
      */
     long count(WithdrawalOrders withdrawalOrders);
 
+    /**
+     * 宸叉彁鐜扮粺璁¢噾棰濓紙status=0/1锛夛紝浣跨敤涓庡垎椤垫煡璇㈢浉鍚岀殑鏉′欢
+     *
+     * @param pageWrap 鍒嗛〉鏌ヨ鏉′欢
+     * @return 宸叉彁鐜版�婚噾棰濓紙鍗曚綅:鍒嗭級
+     */
+    Long totalAmount(PageWrap<WithdrawalOrders> pageWrap);
 
-    void transferSuccess(String outBillNo,Boolean isSuccess);
+    /**
+     * 鎻愮幇瀹℃壒
+     *
+     * @param dto 瀹℃壒鍙傛暟
+     */
+    void approve(WithdrawalApproveDTO dto);
+
+    /**
+     * 鍙告満鎻愮幇鐢宠
+     *
+     * @param dto      鎻愮幇鍙傛暟
+     * @param memberId 浼氬憳涓婚敭
+     */
+    void applyDriverWithdrawal(WithdrawalDTO dto, Integer memberId);
+
+    /**
+     * 闂ㄥ簵鎻愮幇鐢宠
+     *
+     * @param dto    鎻愮幇鍙傛暟
+     * @param shopId 闂ㄥ簵涓婚敭
+     */
+    void applyShopWithdrawal(WithdrawalDTO dto, Integer shopId);
 
 }

--
Gitblit v1.9.3