From c788ca1640f080f821cb1cbe07da741302d355ef Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 02 七月 2026 14:43:08 +0800
Subject: [PATCH] Merge branch 'feature/3.0' into feature/fangxinxing

---
 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
index 91761e7..9dabfd9 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
@@ -61,4 +61,34 @@
      * @return
      */
     List<Map<String, Object>> queryDriver(String orderId) throws Exception;
+
+    /**
+     * 司机响应改派申请
+     * @param reassignId 改派ID
+     * @param driverId 司机ID
+     * @param responseType 响应类型(1=同意,2=拒绝)
+     * @return
+     */
+    ResultUtil respondReassign(Integer reassignId, Integer driverId, Integer responseType);
+
+    /**
+     * 批量响应改派申请
+     * @param reassignIds 改派ID列表(逗号分隔)
+     * @param driverId 司机ID
+     * @param responseType 响应类型(1=同意,2=拒绝)
+     * @return
+     */
+    ResultUtil respondReassignBatch(String reassignIds, Integer driverId, Integer responseType);
+
+    /**
+     * 查询待确认的改派申请列表
+     * @param driverId 司机ID
+     * @return
+     */
+    List<Map<String, Object>> queryPendingReassigns(Integer driverId);
+
+    /**
+     * 改派确认超时后恢复订单状态
+     */
+    void timeoutReassign(Reassign reassign) throws Exception;
 }

--
Gitblit v1.7.1