From 49ffecc181ee442546864c0eb78ba9be66cede15 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 09 九月 2023 10:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 f32cec1..9533856 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;
/**
@@ -90,7 +90,7 @@
* @return
* @throws Exception
*/
- ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language) throws Exception;
+ ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language,int type) throws Exception;
/**
@@ -205,7 +205,7 @@
* @param uid
* @throws Exception
*/
- void updateInfo(String avatar, String nickname, Integer sex, Date birthday, String email, String lastName, String firstName, 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;
/**
* 获取实名认证数据
@@ -221,10 +221,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, Integer language) throws Exception;
+ void payCancelUserBalance(Integer id, String order_id, Integer paymentRecordId, Integer language) throws Exception;
/**
@@ -250,4 +249,5 @@
* @return
*/
Integer queryLanguage(Integer uid, Integer language);
+
}
--
Gitblit v1.7.1