From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
index 56a5ea2..8d04e3d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
@@ -37,7 +37,7 @@
      * @return
      * @throws Exception
      */
-    boolean checkCaptcha(String phone, String code) throws Exception;
+    boolean checkCaptcha(String email, String phone, String code) throws Exception;
 
 
     /**
@@ -45,6 +45,11 @@
      * @throws Exception
      */
     ResultUtil registeredDriver(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception;
+
+
+
+    ResultUtil registeredDriver1(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception;
+
 
 
     /**
@@ -115,7 +120,7 @@
      * @return
      * @throws Exception
      */
-    Map<String, Object> queryHomeData(Integer uid) throws Exception;
+    Map<String, Object> queryHomeData(Integer uid, Integer language) throws Exception;
 
 
     /**
@@ -170,7 +175,7 @@
      * @return
      * @throws Exception
      */
-    Map<String, Object> queryInfo(Integer uid) throws Exception;
+    Map<String, Object> queryInfo(Integer language, Integer uid) throws Exception;
 
 
     /**
@@ -238,18 +243,18 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryPenalties(Integer pageNum, Integer size, Integer uid) throws Exception;
+    List<Map<String, Object>> queryPenalties(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception;
 
 
     /**
-     * 获取活动奖励列表
+     * 获取列表
      * @param uid
      * @param pageNum
      * @param size
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryActivityIncome(Integer uid, Integer pageNum, Integer size) throws Exception;
+    List<Map<String, Object>> queryActivityIncome(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
 
 
     /**
@@ -260,7 +265,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryTotalRevenue(Integer uid, Integer pageNum, Integer size) throws Exception;
+    List<Map<String, Object>> queryTotalRevenue(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
 
 
     /**
@@ -269,8 +274,11 @@
      * @return
      * @throws Exception
      */
-    List<ActivityWarpper> queryMyActivity(Integer uid, Date time) throws Exception;
-
+    List<ActivityWarpper> queryMyActivity(Integer uid, Date time, Integer language) throws Exception;
+    
+    
+    List<ActivityWarpper> queryHistoryList(Integer uid, Date time, Integer language) throws Exception;
+    
 
     /**
      * 获取历史活动
@@ -278,7 +286,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryHistory(Integer uid, Integer pageNum, Integer size) throws Exception;
+    List<Map<String, Object>> queryHistory(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
 
 
     /**
@@ -384,7 +392,7 @@
      * @param size
      * @return java.util.List<Map<String,Object>>
      */
-    List<Map<String,Object>> queryMyInviteList(Integer type,Integer uid, Integer pageNum, Integer size) throws Exception;
+    List<Map<String,Object>> queryMyInviteList(Integer language, Integer type,Integer uid, Integer pageNum, Integer size) throws Exception;
 
     /**
      *
@@ -415,4 +423,18 @@
      * @return
      */
     Double getThisWeekMoney(@Param("driverId") Integer driverId);
+    
+    
+    /**
+     * 获取给定车型且空闲的司机
+     * @param type
+     * @param serverCarModelId
+     * @param lon
+     * @param lat
+     * @param distance
+     * @param companyId
+     * @return
+     * @throws Exception
+     */
+    List<Driver> queryIdleDriver(Integer userId, Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId) throws Exception;
 }

--
Gitblit v1.7.1