From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java | 98 +++++++++++++++++++++++++++++++------------------ 1 files changed, 62 insertions(+), 36 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..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,11 @@ 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; import com.yeshi.fanli.entity.bus.user.UserInfo; +import com.yeshi.fanli.entity.bus.user.WeiXinUser; import com.yeshi.fanli.exception.user.UserAccountException; /** @@ -25,8 +26,9 @@ * @return * @throws UserAccountException */ - public LoginResult login(HttpServletRequest request, 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; /** * 娌℃湁瀹夎寰俊鏃跺�欑殑鐧诲綍 @@ -39,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; /** * 娉ㄥ唽鐢ㄦ埛 @@ -152,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; /** * 娓呯悊鐢ㄦ埛澶村儚 @@ -170,6 +149,7 @@ /** * 鐢佃瘽鍙风爜鐧诲綍 1.5.3 + * * @param request * @param first * @param appId @@ -177,11 +157,12 @@ * @return * @throws UserAccountException */ - public UserInfo loginPhone(HttpServletRequest request, int loginType, String vcode, String phone, String appId) + public UserInfo loginPhone(HttpServletRequest request, int loginType, String vcode, String phone, String appId) throws UserAccountException; /** - *寰俊鐧诲綍 1.5.3 + * 寰俊鐧诲綍 1.5.3 + * * @param request * @param first * @param appId @@ -190,11 +171,12 @@ * @return * @throws UserAccountException */ - public UserInfo loginWinXin(HttpServletRequest request,int loginType, String code, String appId) - throws UserAccountException; + public UserInfo loginWinXin(HttpServletRequest request, AcceptData acceptData, int loginType, String code, + String appId) throws UserAccountException; /** - * 缁戝畾鐢佃瘽鍙风爜 V1.5.3 + * 缁戝畾鐢佃瘽鍙风爜 V1.5.3 + * * @param uid * @param phone * @throws UserAccountException @@ -202,15 +184,28 @@ public void bindPhoneNew(Long uid, String phone) throws UserAccountException; /** - * 缁戝畾寰俊 V1.5.3 + * 缁戝畾寰俊 V1.5.3 + * * @param uid * @param code * @throws UserAccountException */ - public void bindWeiXin(Long uid, String 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 */ @@ -218,6 +213,7 @@ /** * 灏佺鐢ㄦ埛鎵�鏈変俊鎭細鎵嬫満鍙枫�佸井淇°�佹窐瀹濄�佹敮浠樺疂 + * * @param uid * @param reason */ @@ -225,6 +221,7 @@ /** * 鍒犻櫎璐︽埛 + * * @param uid * @param reason */ @@ -232,8 +229,37 @@ /** * 闀挎椂闂存湭鐧诲綍璐︽埛鍒犻櫎 + * * @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