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 | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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..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
@@ -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,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;
/**
@@ -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