From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java |  162 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 129 insertions(+), 33 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 62ba7e7..f29afb7 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,10 +1,12 @@
 package com.yeshi.fanli.service.inter.user;
 
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
 
+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.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.exception.user.UserAccountException;
 
 /**
  * 鐧诲綍鏈嶅姟
@@ -24,8 +26,9 @@
 	 * @return
 	 * @throws UserAccountException
 	 */
-	public LoginResult login(HttpSession session, Boolean first, String appId, String code, String phone,
-			UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException;
+	public LoginResult login(HttpServletRequest request, AcceptData acceptData, Boolean first, String appId,
+			String code, String phone, UserInfo tbUserInfo, boolean wxinstall, int loginType)
+			throws UserAccountException;
 
 	/**
 	 * 娌℃湁瀹夎寰俊鏃跺�欑殑鐧诲綍
@@ -38,32 +41,9 @@
 	 * @return
 	 * @throws UserAccountException
 	 */
-	public LoginResult loginNoInstallWX(String appId, String code, String phone, UserInfo tbUserInfo, int loginType)
-			throws UserAccountException;
+	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;
 
 	/**
 	 * 娉ㄥ唽鐢ㄦ埛
@@ -79,7 +59,7 @@
 	 * @param unionId
 	 * @return
 	 */
-	public UserInfo getUserInfoByWXUnionId(String appId, String unionId);
+	public UserInfo getUserInfoByWXUnionId(String appId, String unionId) throws UserAccountException;
 
 	/**
 	 * 鏍规嵁绯荤粺鍜屾窐瀹濈殑Openid瀵绘壘鐢ㄦ埛
@@ -88,7 +68,7 @@
 	 * @param openId
 	 * @return
 	 */
-	public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId);
+	public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId) throws UserAccountException;
 
 	/**
 	 * 鏍规嵁绯荤粺鍜岀數璇濆彿鐮佸鎵剧敤鎴�
@@ -97,7 +77,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);
 
@@ -151,7 +131,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;
 
 	/**
 	 * 娓呯悊鐢ㄦ埛澶村儚
@@ -166,4 +146,120 @@
 	 * @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;
+	
+	
+	/**
+	 * 缁戝畾寰俊 V1.5.3
+	 * 
+	 * @param uid
+	 * @param code
+	 * @throws UserAccountException
+	 */
+	public void bindWeiXin( Long uid, WeiXinUser wxUser	) 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