From cd637932a970e7935b17d41568fe89c92775bccc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 十二月 2019 17:18:27 +0800
Subject: [PATCH] 双12活动添加,邀请码发布修改,爬单新规则添加

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java |  108 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 101 insertions(+), 7 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..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,9 +3,10 @@
 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.UserAccountException;
+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;
 
 	/**
@@ -80,7 +81,7 @@
 	 * @param unionId
 	 * @return
 	 */
-	public UserInfo getUserInfoByWXUnionId(String appId, String unionId);
+	public UserInfo getUserInfoByWXUnionId(String appId, String unionId) throws UserAccountException;
 
 	/**
 	 * 鏍规嵁绯荤粺鍜屾窐瀹濈殑Openid瀵绘壘鐢ㄦ埛
@@ -89,7 +90,7 @@
 	 * @param openId
 	 * @return
 	 */
-	public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId);
+	public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId) throws UserAccountException;
 
 	/**
 	 * 鏍规嵁绯荤粺鍜岀數璇濆彿鐮佸鎵剧敤鎴�
@@ -98,7 +99,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);
 
@@ -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;
 
 	/**
 	 * 娓呯悊鐢ㄦ埛澶村儚
@@ -167,4 +168,97 @@
 	 * @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,AcceptData acceptData,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(AcceptData acceptData,Long uid, String code) throws UserAccountException;
+
+	/**
+	 * 璐︽埛灏佺
+	 * @param uid
+	 * @param reason
+	 */
+	public void forbiddenUser(Long uid, String reason);
+
+	/**
+	 * 灏佺鐢ㄦ埛鎵�鏈変俊鎭細鎵嬫満鍙枫�佸井淇°�佹窐瀹濄�佹敮浠樺疂
+	 * @param uid
+	 * @param reason
+	 */
+	public void forbiddenUserAll(Long uid, String reason);
+
+	/**
+	 * 鍒犻櫎璐︽埛
+	 * @param uid
+	 * @param reason
+	 */
+	public void DeleteUser(Long uid, String reason);
+
+	/**
+	 * 闀挎椂闂存湭鐧诲綍璐︽埛鍒犻櫎
+	 * @param uid
+	 * @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