From f94a5a1d3fe9bde0e599d41f2d97caea1b08a88d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 15:48:12 +0800
Subject: [PATCH] 免单调整

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 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 28b1751..39d0c4b 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
@@ -1,7 +1,6 @@
 package com.yeshi.fanli.service.inter.user;
 
 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;
@@ -45,29 +44,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;
 
 	/**
 	 * 娉ㄥ唽鐢ㄦ埛
@@ -286,4 +262,31 @@
 	public UserInfo bindPhoneToLogin(String phone, String key, String appId, HttpServletRequest request)
 			throws UserAccountException;
 
+	/**
+	 * 鎵嬫満鐧诲綍闇�瑕佺粦瀹氬井淇�
+	 * @param request
+	 * @param loginType
+	 * @param vcode
+	 * @param phone
+	 * @param appId
+	 * @return
+	 * @throws UserAccountException
+	 */
+	public UserInfo loginPhoneNew(HttpServletRequest request, int loginType, String vcode, String phone, String appId)
+			throws UserAccountException;
+
+	/**
+	 * 缁戝畾寰俊鐧诲綍 + 鎵嬫満鍙穔ey
+	 * @param request
+	 * @param acceptData
+	 * @param loginType
+	 * @param code
+	 * @param appId
+	 * @param key
+	 * @return
+	 * @throws UserAccountException
+	 */
+	public UserInfo bindWXToLogin(HttpServletRequest request, AcceptData acceptData, String code, String appId,
+			String key) throws UserAccountException;
+
 }

--
Gitblit v1.8.0