From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java |   47 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java
index f5cbb1a..3b1613b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java
@@ -80,7 +80,7 @@
 	 * @param unionId
 	 * @return
 	 */
-	public UserInfo getUserInfoByWXUnionId(String appId, String unionId);
+	public UserInfo getUserInfoByWXUnionId(String appId, String unionId) throws UserAccountException;
 
 	/**
 	 * 鏍规嵁绯荤粺鍜屾窐瀹濈殑Openid瀵绘壘鐢ㄦ埛
@@ -89,7 +89,7 @@
 	 * @param openId
 	 * @return
 	 */
-	public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId);
+	public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId) throws UserAccountException;
 
 	/**
 	 * 鏍规嵁绯荤粺鍜岀數璇濆彿鐮佸鎵剧敤鎴�
@@ -98,7 +98,7 @@
 	 * @param phone
 	 * @return
 	 */
-	public UserInfo getUserInfoByPhone(String appId, String phone);
+	public UserInfo getUserInfoByPhone(String appId, String phone) throws UserAccountException;
 
 	public void addUser(UserInfo user);
 
@@ -167,4 +167,45 @@
 	 * @param uid
 	 */
 	public String repairPortrait(Long uid);
+
+	/**
+	 * 鐢佃瘽鍙风爜鐧诲綍 1.5.3
+	 * @param request
+	 * @param first
+	 * @param appId
+	 * @param phone
+	 * @return
+	 * @throws UserAccountException
+	 */
+	public UserInfo loginPhone(HttpServletRequest request, int loginType, String vcode, String phone,  String appId)
+			throws UserAccountException;
+
+	/**
+	 *寰俊鐧诲綍 1.5.3
+	 * @param request
+	 * @param first
+	 * @param appId
+	 * @param code
+	 * @param loginType
+	 * @return
+	 * @throws UserAccountException
+	 */
+	public UserInfo loginWinXin(HttpServletRequest request,int loginType, String code, String appId)
+			throws UserAccountException;
+
+	/**
+	 *   缁戝畾鐢佃瘽鍙风爜  V1.5.3
+	 * @param uid
+	 * @param phone
+	 * @throws UserAccountException
+	 */
+	public void bindPhoneNew(Long uid, String phone) throws UserAccountException;
+
+	/**
+	 *  缁戝畾寰俊 V1.5.3
+	 * @param uid
+	 * @param code
+	 * @throws UserAccountException
+	 */
+	public void bindWeiXin(Long uid, String code) throws UserAccountException;
 }

--
Gitblit v1.8.0