From b2be889ee9931b8ca97d77258466d75043b22786 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 18 八月 2025 21:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
index 6f879e7..d4cb339 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
@@ -20,6 +20,7 @@
      */
     List<Driver> queryIdleDriver(Integer type, Double lon, Double lat, Double distance, Integer companyId) throws Exception;
     List<Driver> queryIdleDriverAll(Integer type, Double lon, Double lat, Double distance, Integer companyId) throws Exception;
+    List<Driver> queryIdleDriverAllCall(Integer type, Double lon, Double lat, Double distance, List<Integer> companyIds) throws Exception;
 
 
     /**
@@ -61,4 +62,13 @@
      * @throws Exception
      */
     List<BaseWarpper> queryBusiness(Integer uid) throws Exception;
+
+    /**
+     * 跨城获取给定车型且相同线路的司机
+     * @param serverCarModelId
+     * @param lineId
+     * @return
+     * @throws Exception
+     */
+    List<Driver> queryDriversByLineAndCarModel (Integer type ,Integer serverCarModelId,  Integer lineId  ) throws Exception;
 }

--
Gitblit v1.7.1