From 82257201c11fe970e82571b30e93822332000eba Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 15 五月 2024 15:26:42 +0800
Subject: [PATCH] 修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java
index 0a0d8f4..ab45ec5 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.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;
/**
@@ -39,11 +39,13 @@
* @param uType 分享用户的类别1:用户,2:司机
* @return
*/
- ResultUtil<LoginWarpper> captchaLogin(String phone, String code, String registIp, String registAreaCode,Integer uid,Integer uType, Integer userType) throws Exception;
+ ResultUtil<LoginWarpper> captchaLogin(String phoneOperator, String phone, String code, String registIp, Double lat, Double lng,Integer uid,Integer uType, Integer userType, Integer language) throws Exception;
- ResultUtil<LoginWarpper> captchaLogin(String phone, String code, Integer uid, Integer type, Integer userType) throws Exception;
+ ResultUtil<LoginWarpper> captchaLogin(String phoneOperator, String phone, String code, Integer uid, Integer type, Integer userType, Integer language) throws Exception;
+
+
/**
@@ -62,7 +64,7 @@
* @return
* @throws Exception
*/
- ResultUtil<LoginWarpper> userLogin(String phone, String password) throws Exception;
+ ResultUtil<LoginWarpper> userLogin(String phone, String password, Integer language) throws Exception;
/**
@@ -75,8 +77,22 @@
* @param registAreaCode 当前定位区县行政编号(6位)
* @return
*/
- ResultUtil<LoginWarpper> wxLogin(Integer type, String openid, String unionid, String jscode, String registIp, String registAreaCode, Integer sex, String nickName, String avatar,String loginType,String encryptedData, String iv,Integer uid) throws Exception;
- ResultUtil<LoginWarpper> wxIsLogin( String jscode) throws Exception;
+ ResultUtil<LoginWarpper> wxLogin(Integer type, String openid, String unionid, String jscode, String registIp, String registAreaCode,
+ Integer sex, String nickName, String avatar,String loginType,String encryptedData, String iv,Integer uid, Integer language) throws Exception;
+
+
+
+ ResultUtil<LoginWarpper> wxIsLogin(Integer language, String jscode) throws Exception;
+
+
+ /**
+ * facebook登录
+ * @param id
+ * @param name
+ * @return
+ * @throws Exception
+ */
+ ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language,int type) throws Exception;
/**
@@ -87,7 +103,7 @@
* @return
* @throws Exception
*/
- ResultUtil forgetPassword(String phone, String code, String password) throws Exception;
+ ResultUtil forgetPassword(String phone, String code, String password, Integer language) throws Exception;
/**
@@ -98,7 +114,19 @@
* @return
* @throws Exception
*/
- ResultUtil bindingPhone(Integer uid, String phone, String code) throws Exception;
+ ResultUtil bindingPhone(Integer uid, String phoneOperator, String phone, String code, Integer language) throws Exception;
+
+
+ /**
+ * 绑定邮箱
+ * @param email
+ * @param code
+ * @return
+ * @throws Exception
+ */
+ ResultUtil bindingEmail(Integer uid, Integer type, String email, String code, Integer language) throws Exception;
+
+
/**
@@ -116,7 +144,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryUserInfo(Integer uid) throws Exception;
+ Map<String, Object> queryUserInfo(Integer language, Integer uid) throws Exception;
/**
@@ -125,7 +153,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryUser(String phone) throws Exception;
+ Map<String, Object> queryUser(Integer language, String phone) throws Exception;
/**
@@ -146,7 +174,7 @@
* @return
* @throws Exception
*/
- ResultUtil depositBalance(Integer payType, Double money, Integer uid, Integer type) throws Exception;
+ ResultUtil depositBalance(Integer payType, String bankCardId, Double money, Integer uid, Integer type, Integer language) throws Exception;
/**
@@ -157,7 +185,7 @@
* @return
* @throws Exception
*/
- ResultUtil updatePhone(String code, String phone, Integer uid) throws Exception;
+ ResultUtil updatePhone(String code, String phoneOperator, String phone, Integer uid, Integer language) throws Exception;
/**
@@ -167,7 +195,7 @@
* @return
* @throws Exception
*/
- ResultUtil updatePass(String password, Integer uid) throws Exception;
+ ResultUtil updatePass(String password, Integer uid, Integer language) throws Exception;
/**
@@ -179,7 +207,7 @@
* @param uid
* @throws Exception
*/
- void updateInfo(String avatar, String nickname, Integer sex, Date birthday, Integer uid) throws Exception;
+ ResultUtil updateInfo(String avatar, String nickname, Integer sex, Date birthday, String email, String code, String lastName, String firstName, Integer uid, Integer language) throws Exception;
/**
* 获取实名认证数据
@@ -195,10 +223,9 @@
* @param id 用户id
* @param order_id 工行订单id
* @param paymentRecordId 预支付订单id
- * @param type 支付类型(1=微信,2=支付宝)
* @throws Exception
*/
- void payCancelUserBalance(Integer id, String order_id, Integer paymentRecordId, Integer type) throws Exception;
+ void payCancelUserBalance(Integer id, String order_id, Integer paymentRecordId, Integer language) throws Exception;
/**
@@ -215,4 +242,14 @@
Integer getAppOpenInfo(Integer type);
+
+
+ /**
+ * 获取语言环境
+ * @param uid
+ * @param language
+ * @return
+ */
+ Integer queryLanguage(Integer uid, Integer language);
+
}
--
Gitblit v1.7.1