From 9b426ebdbe9d283cd6f01719db9a00f2533df286 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 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..864661e 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
@@ -39,11 +39,11 @@
* @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 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 phone, String code, Integer uid, Integer type, Integer userType, Integer language) throws Exception;
/**
@@ -62,7 +62,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 +75,19 @@
* @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> 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( 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) throws Exception;
/**
@@ -87,7 +98,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 +109,19 @@
* @return
* @throws Exception
*/
- ResultUtil bindingPhone(Integer uid, String phone, String code) throws Exception;
+ ResultUtil bindingPhone(Integer uid, 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;
+
+
/**
@@ -146,7 +169,7 @@
* @return
* @throws Exception
*/
- ResultUtil depositBalance(Integer payType, Double money, Integer uid, Integer type) throws Exception;
+ ResultUtil depositBalance(Integer payType, String accountNumber, Double money, Integer uid, Integer type, Integer language) throws Exception;
/**
@@ -157,7 +180,7 @@
* @return
* @throws Exception
*/
- ResultUtil updatePhone(String code, String phone, Integer uid) throws Exception;
+ ResultUtil updatePhone(String code, String phone, Integer uid, Integer language) throws Exception;
/**
@@ -167,7 +190,7 @@
* @return
* @throws Exception
*/
- ResultUtil updatePass(String password, Integer uid) throws Exception;
+ ResultUtil updatePass(String password, Integer uid, Integer language) throws Exception;
/**
@@ -179,7 +202,7 @@
* @param uid
* @throws Exception
*/
- void updateInfo(String avatar, String nickname, Integer sex, Date birthday, Integer uid) throws Exception;
+ void updateInfo(String avatar, String nickname, Integer sex, Date birthday, String email, String lastName, String firstName, Integer uid) throws Exception;
/**
* 获取实名认证数据
@@ -198,7 +221,7 @@
* @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 type, Integer language) throws Exception;
/**
@@ -215,4 +238,13 @@
Integer getAppOpenInfo(Integer type);
+
+
+ /**
+ * 获取语言环境
+ * @param uid
+ * @param language
+ * @return
+ */
+ Integer queryLanguage(Integer uid, Integer language);
}
--
Gitblit v1.7.1