From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 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 67f60bf..5219aef 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
@@ -18,7 +18,7 @@
* @param phone
* @return
*/
- ResultUtil queryCaptcha(String phone, Integer type) throws Exception;
+ ResultUtil queryCaptcha(String phone, Integer type, Integer language) throws Exception;
/**
@@ -27,7 +27,7 @@
* @return
* @throws Exception
*/
- ResultUtil queryEmailCaptcha(String email) throws Exception;
+ ResultUtil queryEmailCaptcha(String email, Integer language) throws Exception;
/**
@@ -37,14 +37,19 @@
* @return
* @throws Exception
*/
- boolean checkCaptcha(String phone, String code) throws Exception;
+ boolean checkCaptcha(String email, String phone, String code) throws Exception;
/**
* 司机提交注册申请
* @throws Exception
*/
- ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType) 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;
+
/**
@@ -57,7 +62,7 @@
* @return
* @throws Exception
*/
- ResultUtil<LoginWarpper> registeredDriver(String phone, String code, String password,Integer uid,Integer uType) throws Exception;
+ ResultUtil<LoginWarpper> registeredDriver(String phoneOperator, String phone, String code, String password,Integer uid,Integer uType, Integer language) throws Exception;
/**
@@ -75,7 +80,7 @@
* @return
* @throws Exception
*/
- ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid) throws Exception;
+ ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid, Integer language) throws Exception;
@@ -87,7 +92,7 @@
* @return
* @throws Exception
*/
- ResultUtil resetPassword(String phone, String code, String password) throws Exception;
+ ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception;
/**
@@ -106,7 +111,7 @@
* @return
* @throws Exception
*/
- ResultUtil<LoginWarpper> driverLogin(String phone, String password) throws Exception;
+ ResultUtil<LoginWarpper> driverLogin(String phone, String password, 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;
/**
@@ -133,7 +138,7 @@
* @return
* @throws Exception
*/
- ResultUtil work(Integer uid, String type) throws Exception;
+ ResultUtil work(Integer uid, String type, Integer language) throws Exception;
@@ -143,7 +148,7 @@
* @return
* @throws Exception
*/
- ResultUtil work2(Integer uid, String type) throws Exception;
+ ResultUtil work2(Integer uid, String type, Integer language) throws Exception;
/**
@@ -152,7 +157,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryHomeNum(Integer uid) throws Exception;
+ Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception;
/**
@@ -161,7 +166,7 @@
* @return
* @throws Exception
*/
- List<BaseWarpper> queryMyBusiness(Integer uid) throws Exception;
+ List<BaseWarpper> queryMyBusiness(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;
/**
@@ -181,7 +186,7 @@
* @return
* @throws Exception
*/
- ResultUtil updatePhone(String phone, String code, Integer uid) throws Exception;
+ ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer uid, Integer language) throws Exception;
/**
@@ -208,7 +213,7 @@
* @param uid
* @throws Exception
*/
- void updatePassword(String password, Integer uid) throws Exception;
+ void updatePassword(String password, Integer uid, Integer language) throws Exception;
/**
@@ -218,7 +223,7 @@
* @return
* @throws Exception
*/
- ResultUtil replaceCar(Integer carId, Integer uid) throws Exception;
+ ResultUtil replaceCar(Integer carId, Integer uid, Integer language) throws Exception;
/**
@@ -238,7 +243,7 @@
* @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;
/**
@@ -249,7 +254,7 @@
* @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,7 +274,7 @@
* @return
* @throws Exception
*/
- List<ActivityWarpper> queryMyActivity(Integer uid, Date time) throws Exception;
+ List<ActivityWarpper> queryMyActivity(Integer uid, Date time, Integer language) throws Exception;
/**
@@ -278,7 +283,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;
/**
@@ -300,7 +305,7 @@
* @param jobNum
* @return
*/
- ResultUtil loginByJobNumber(String jobNum);
+ ResultUtil loginByJobNumber(String jobNum, Integer language);
/**
@@ -317,7 +322,7 @@
* @return
* @throws Exception
*/
- ResultUtil loginByIdentification(String identification) throws Exception;
+ ResultUtil loginByIdentification(String identification, Integer language) throws Exception;
/**
@@ -326,7 +331,7 @@
* @return
* @throws Exception
*/
- ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard) throws Exception;
+ ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language) throws Exception;
/**
@@ -343,7 +348,7 @@
* @return
* @throws Exception
*/
- ResultUtil verificationPassword(String password, Integer driverId) throws Exception;
+ ResultUtil verificationPassword(String password, Integer driverId, Integer language) throws Exception;
/**
@@ -353,7 +358,7 @@
* @return
* @throws Exception
*/
- ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId) throws Exception;
+ ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception;
/**
@@ -363,7 +368,7 @@
* @return
* @throws Exception
*/
- ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId) throws Exception;
+ ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception;
/**
@@ -384,7 +389,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;
/**
*
--
Gitblit v1.7.1