From 8b2191df2f7d94aa299bd43dcbe97c94e5a61bbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 十一月 2019 14:53:34 +0800
Subject: [PATCH] RocketMQ的消息整改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 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 e87e56d..34ab97e 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
@@ -3,6 +3,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.user.LoginResult;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.exception.user.UserAccountException;
@@ -25,7 +26,7 @@
 	 * @return
 	 * @throws UserAccountException
 	 */
-	public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,
+	public LoginResult login(HttpServletRequest request,AcceptData acceptData,  Boolean first, String appId, String code, String phone,
 			UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException;
 
 	/**
@@ -39,7 +40,7 @@
 	 * @return
 	 * @throws UserAccountException
 	 */
-	public LoginResult loginNoInstallWX(String appId, String code, String phone, UserInfo tbUserInfo, int loginType)
+	public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone, UserInfo tbUserInfo, int loginType)
 			throws UserAccountException;
 
 	/**
@@ -152,7 +153,7 @@
 	 * @param uid
 	 * @param code
 	 */
-	public void changeWXBind(Long uid, String code) throws UserAccountException;
+	public void changeWXBind(AcceptData acceptData,Long uid, String code) throws UserAccountException;
 
 	/**
 	 * 娓呯悊鐢ㄦ埛澶村儚
@@ -190,7 +191,7 @@
 	 * @return
 	 * @throws UserAccountException
 	 */
-	public UserInfo loginWinXin(HttpServletRequest request,int loginType, String code, String appId)
+	public UserInfo loginWinXin(HttpServletRequest request,AcceptData acceptData,int loginType, String code, String appId)
 			throws UserAccountException;
 
 	/**
@@ -207,7 +208,7 @@
 	 * @param code
 	 * @throws UserAccountException
 	 */
-	public void bindWeiXin(Long uid, String code) throws UserAccountException;
+	public void bindWeiXin(AcceptData acceptData,Long uid, String code) throws UserAccountException;
 
 	/**
 	 * 璐︽埛灏佺
@@ -236,4 +237,28 @@
 	 * @param reason
 	 */
 	public void DeleteUserOutOfDate(Long uid, String reason);
+
+	/**
+	 * 2.0.1 鏂扮櫥褰曟柟寮� -寰俊
+	 * @param request
+	 * @param acceptData
+	 * @param loginType
+	 * @param wxCode
+	 * @param appId
+	 * @return
+	 * @throws UserAccountException
+	 */
+	public UserInfo loginWeiXinNew(HttpServletRequest request, AcceptData acceptData, int loginType, String wxCode, String appId) throws UserAccountException;
+
+	/**
+	 * 鏈敞鍐屼箣鍓嶇粦瀹氭墜鏈哄彿
+	 * @param phone
+	 * @param key
+	 * @param appId
+	 * @param request
+	 * @return
+	 * @throws UserAccountException
+	 */
+	public UserInfo bindPhoneToLogin(String phone, String key, String appId, HttpServletRequest request)
+			throws UserAccountException;
 }

--
Gitblit v1.8.0