From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 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 923ac6b..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,7 +75,8 @@
      * @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;
 
 
@@ -86,7 +87,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil facebookLogin(String id, String name, String email, String registAreaCode, Integer uid) throws Exception;
+    ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language) throws Exception;
 
 
     /**
@@ -97,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;
 
 
     /**
@@ -108,7 +109,7 @@
      * @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;
 
 
     /**
@@ -118,7 +119,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil bindingEmail(Integer uid, Integer type, String email, String code) throws Exception;
+    ResultUtil bindingEmail(Integer uid, Integer type, String email, String code, Integer language) throws Exception;
 
 
 
@@ -168,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;
 
 
     /**
@@ -179,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;
 
 
     /**
@@ -189,7 +190,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil updatePass(String password, Integer uid) throws Exception;
+    ResultUtil updatePass(String password, Integer uid, Integer language) throws Exception;
 
 
     /**
@@ -201,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;
 
     /**
      * 获取实名认证数据
@@ -220,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;
 
 
     /**
@@ -237,4 +238,13 @@
 
 
     Integer getAppOpenInfo(Integer type);
+
+
+    /**
+     * 获取语言环境
+     * @param uid
+     * @param language
+     * @return
+     */
+    Integer queryLanguage(Integer uid, Integer language);
 }

--
Gitblit v1.7.1