From 25a638e0d5f282d26ff9da47e5b7aa5c9c1603d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 18:34:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 ced9ff2..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
@@ -47,6 +47,11 @@
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;
+
+
+
/**
* 司机注册
* @param phone
@@ -242,7 +247,7 @@
/**
- * 获取活动奖励列表
+ * 获取列表
* @param uid
* @param pageNum
* @param size
@@ -270,7 +275,10 @@
* @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;
/**
@@ -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