From ec8a1c6f81b5747e9efce86faaba33d10df7f61d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 01 三月 2020 16:37:26 +0800
Subject: [PATCH] 动态提示语调整

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java |   37 ++++++++++++-------------------------
 1 files changed, 12 insertions(+), 25 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 bbb6076..b29d3ad 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,11 +3,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import com.yeshi.fanli.dto.user.wx.WXMPLoginData;
-import com.yeshi.fanli.dto.user.wx.WXMPLoginResult;
 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.entity.bus.user.WeiXinUser;
 import com.yeshi.fanli.exception.user.UserAccountException;
 
 /**
@@ -46,29 +45,6 @@
 	public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone,
 			UserInfo tbUserInfo, int loginType) throws UserAccountException;
 
-	/**
-	 * 鎵撻�氬井淇¤处鍙蜂笌鍏朵粬绫诲瀷鐨勪竴涓处鍙�
-	 * 
-	 * @param session
-	 * @throws UserAccountException
-	 */
-	public void connectUsers(HttpSession session) throws UserAccountException;
-
-	/**
-	 * 澶囦唤閲嶈鐨勭敤鎴蜂俊鎭�
-	 * 
-	 * @param uid
-	 */
-	public String backupUserImportantInfo(Long uid);
-
-	/**
-	 * 鎵撻�氫袱涓处鍙凤紝浠ヤ富璐﹀彿涓轰富
-	 * 
-	 * @param mainUser
-	 * @param lessUser
-	 * @throws UserAccountException
-	 */
-	public void connectUsers(UserInfo mainUser, UserInfo lessUser) throws UserAccountException;
 
 	/**
 	 * 娉ㄥ唽鐢ㄦ埛
@@ -216,6 +192,17 @@
 	 * @throws UserAccountException
 	 */
 	public void bindWeiXin(AcceptData acceptData, Long uid, String code) throws UserAccountException;
+	
+	
+	/**
+	 * 缁戝畾寰俊 V1.5.3
+	 * 
+	 * @param uid
+	 * @param code
+	 * @throws UserAccountException
+	 */
+	public void bindWeiXin( Long uid, WeiXinUser wxUser	) throws UserAccountException;
+
 
 	/**
 	 * 璐︽埛灏佺

--
Gitblit v1.8.0