From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java |  511 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 265 insertions(+), 246 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 4a46b3d..08464c8 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
@@ -7,289 +7,308 @@
 import com.yeshi.fanli.entity.bus.user.WeiXinUser;
 import com.yeshi.fanli.entity.system.BusinessSystem;
 import com.yeshi.fanli.exception.user.UserAccountException;
+import com.yeshi.fanli.vo.taobao.TaoBaoUser;
 import org.yeshi.utils.entity.ProxyIP;
 
 import javax.servlet.http.HttpServletRequest;
 
 /**
  * 鐧诲綍鏈嶅姟
- * 
- * @author Administrator
  *
+ * @author Administrator
  */
 public interface UserAccountService {
-	/**
-	 * 鐢ㄦ埛鐧诲綍
-	 * 
-	 * @param code
-	 * @param phone
-	 * @param wxinstall
-	 * @param loginType
-	 * @return
-	 * @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;
+    /**
+     * 鐢ㄦ埛鐧诲綍
+     *
+     * @param code
+     * @param phone
+     * @param wxinstall
+     * @param loginType
+     * @return
+     * @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;
 
-	/**
-	 * 娌℃湁瀹夎寰俊鏃跺�欑殑鐧诲綍
-	 * 
-	 * @param appId
-	 * @param code
-	 * @param phone
-	 * @param tbUserInfo
-	 * @param loginType
-	 * @return
-	 * @throws UserAccountException
-	 */
-	public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone,
-			UserInfo tbUserInfo, int loginType) throws UserAccountException;
+    /**
+     * 娌℃湁瀹夎寰俊鏃跺�欑殑鐧诲綍
+     *
+     * @param appId
+     * @param code
+     * @param phone
+     * @param tbUserInfo
+     * @param loginType
+     * @return
+     * @throws UserAccountException
+     */
+    public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone,
+                                        UserInfo tbUserInfo, int loginType) throws UserAccountException;
 
 
-	/**
-	 * 娉ㄥ唽鐢ㄦ埛
-	 * 
-	 * @param userInfo
-	 */
-	public void register(UserInfo userInfo) throws UserAccountException;
+    /**
+     * 娉ㄥ唽鐢ㄦ埛
+     *
+     * @param userInfo
+     */
+    public void register(UserInfo userInfo) throws UserAccountException;
 
 
-	/**
-	 * 鏍规嵁绯荤粺涓庡井淇nionid鑾峰彇鐢ㄦ埛淇℃伅
-	 * @param system
-	 * @param unionId
-	 * @return
-	 * @throws UserAccountException
-	 */
-	public UserInfo getUserInfoByWXUnionId(SystemEnum system, String unionId) throws UserAccountException;
+    /**
+     * 鏍规嵁绯荤粺涓庡井淇nionid鑾峰彇鐢ㄦ埛淇℃伅
+     *
+     * @param system
+     * @param unionId
+     * @return
+     * @throws UserAccountException
+     */
+    public UserInfo getUserInfoByWXUnionId(SystemEnum system, String unionId) throws UserAccountException;
 
-	/**
-	 * 鏍规嵁绯荤粺鍜屾窐瀹濈殑Openid瀵绘壘鐢ㄦ埛
-	 * @param system
-	 * @param openId
-	 * @return
-	 * @throws UserAccountException
-	 */
-	public UserInfo getUserInfoByTaoBaoOpenId(SystemEnum system, String openId) throws UserAccountException;
+    /**
+     * 鏍规嵁绯荤粺鍜屾窐瀹濈殑Openid瀵绘壘鐢ㄦ埛
+     *
+     * @param system
+     * @param openId
+     * @return
+     * @throws UserAccountException
+     */
+    public UserInfo getUserInfoByTaoBaoOpenId(SystemEnum system, String openId) throws UserAccountException;
 
 
-	/**
-	 * 鏍规嵁绯荤粺鍜岀數璇濆彿鐮佸鎵剧敤鎴�
-	 * @param system
-	 * @param phone
-	 * @return
-	 * @throws UserAccountException
-	 */
-	public UserInfo getUserInfoByPhone(SystemEnum system, String phone) throws UserAccountException;
+    /**
+     * 鏍规嵁绯荤粺鍜岀數璇濆彿鐮佸鎵剧敤鎴�
+     *
+     * @param system
+     * @param phone
+     * @return
+     * @throws UserAccountException
+     */
+    public UserInfo getUserInfoByPhone(SystemEnum system, String phone) throws UserAccountException;
 
-	public void addUser(UserInfo user);
+    public void addUser(UserInfo user);
 
-	/**
-	 * 鏇存敼閮ㄥ垎鐢ㄦ埛淇℃伅
-	 * 
-	 * @param user
-	 */
-	public void updateUserSelective(UserInfo user);
+    /**
+     * 鏇存敼閮ㄥ垎鐢ㄦ埛淇℃伅
+     *
+     * @param user
+     */
+    public void updateUserSelective(UserInfo user);
 
-	/**
-	 * 缁戝畾鐢佃瘽鍙风爜
-	 * 
-	 * @param uid
-	 * @param phone
-	 * @throws UserAccountException
-	 */
-	public void bindPhone(Long uid, String phone) throws UserAccountException;
+    /**
+     * 缁戝畾鐢佃瘽鍙风爜
+     *
+     * @param uid
+     * @param phone
+     * @throws UserAccountException
+     */
+    public void bindPhone(Long uid, String phone) throws UserAccountException;
 
-	/**
-	 * 瑙g粦鐢佃瘽
-	 * 
-	 * @param uid
-	 * @param phone
-	 * @throws UserAccountException
-	 */
-	public void unBindPhone(Long uid, String phone) throws UserAccountException;
+    /**
+     * 瑙g粦鐢佃瘽
+     *
+     * @param uid
+     * @param phone
+     * @throws UserAccountException
+     */
+    public void unBindPhone(Long uid, String phone) throws UserAccountException;
 
-	/**
-	 * 缁戝畾娣樺疂
-	 * 
-	 * @param uid
-	 * @param tbOpenId
-	 * @param tbNickName
-	 * @param tbPortrait
-	 * @throws UserAccountException
-	 */
-	public void bindTaoBao(Long uid, String tbOpenId, String tbNickName, String tbPortrait) throws UserAccountException;
+    /**
+     * 缁戝畾娣樺疂
+     *
+     * @param uid
+     * @param tbOpenId
+     * @param tbNickName
+     * @param tbPortrait
+     * @throws UserAccountException
+     */
+    public void bindTaoBao(Long uid, String tbOpenId, String tbNickName, String tbPortrait) throws UserAccountException;
 
-	/**
-	 * 瑙g粦娣樺疂
-	 * 
-	 * @param uid
-	 * @throws UserAccountException
-	 */
-	public void unBindTaoBao(Long uid) throws UserAccountException;
+    /**
+     * 瑙g粦娣樺疂
+     *
+     * @param uid
+     * @throws UserAccountException
+     */
+    public void unBindTaoBao(Long uid) throws UserAccountException;
 
-	/**
-	 * 鏇存敼寰俊缁戝畾
-	 * 
-	 * @param uid
-	 * @param code
-	 */
-	public void changeWXBind(AcceptData acceptData, Long uid, String code) throws UserAccountException;
+    /**
+     * 鏇存敼寰俊缁戝畾
+     *
+     * @param uid
+     * @param code
+     */
+    public void changeWXBind(AcceptData acceptData, Long uid, String code) throws UserAccountException;
 
-	/**
-	 * 娓呯悊鐢ㄦ埛澶村儚
-	 * 
-	 * @param uid
-	 */
-	public void clearUserPortrait(Long uid);
+    /**
+     * 娓呯悊鐢ㄦ埛澶村儚
+     *
+     * @param uid
+     */
+    public void clearUserPortrait(Long uid);
 
-	/**
-	 * 淇鐢ㄦ埛澶村儚
-	 * 
-	 * @param uid
-	 */
-	public String repairPortrait(Long uid);
+    /**
+     * 淇鐢ㄦ埛澶村儚
+     *
+     * @param uid
+     */
+    public String repairPortrait(Long uid);
 
-	/**
-	 *  鐢佃瘽鍙风爜鐧诲綍 1.5.3
-	 * @param ipInfo
-	 * @param acceptData
-	 * @param loginType
-	 * @param vcode
-	 * @param phone
-	 * @param appId
-	 * @return
-	 * @throws UserAccountException
-	 */
-	@Deprecated
-	public UserInfo loginPhone(ProxyIP ipInfo, int loginType, String vcode, String phone, BusinessSystem businessSystem)
-			throws UserAccountException;
+    /**
+     * 鐢佃瘽鍙风爜鐧诲綍 1.5.3
+     *
+     * @param ipInfo
+     * @param loginType
+     * @param vcode
+     * @param phone
+     * @param businessSystem
+     * @return
+     * @throws UserAccountException
+     */
+    @Deprecated
+    public UserInfo loginPhone(ProxyIP ipInfo, int loginType, String vcode, String phone, BusinessSystem businessSystem)
+            throws UserAccountException;
+
+    /**
+     * 娣樺疂鐧诲綍
+     *
+     * @param ipInfo
+     * @param taoBaoUser -娣樺疂淇℃伅
+     * @param businessSystem
+     * @return
+     * @throws UserAccountException
+     */
+    public UserInfo loginTB(ProxyIP ipInfo, TaoBaoUser taoBaoUser, BusinessSystem businessSystem)
+            throws UserAccountException;
+
+    /**
+     * 寰俊鐧诲綍 1.5.3
+     *
+     * @param ipInfo
+     * @param loginType
+     * @param code
+     * @param businessSystem
+     * @return
+     * @throws UserAccountException
+     */
+    @Deprecated
+    public UserInfo loginWeiXin(ProxyIP ipInfo, int loginType, String code, BusinessSystem businessSystem) 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;
 
 
-	/**
-	 * 寰俊鐧诲綍 1.5.3
-	 * @param ipInfo
-	 * @param acceptData
-	 * @param loginType
-	 * @param code
-	 * @param appId
-	 * @return
-	 * @throws UserAccountException
-	 */
-	@Deprecated
-	public UserInfo loginWeiXin(ProxyIP ipInfo, int loginType, String code, BusinessSystem businessSystem) 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 wxUser
-	 * @throws UserAccountException
-	 */
-	public void bindWeiXin( Long uid, WeiXinUser wxUser	) throws UserAccountException;
+    /**
+     * 缁戝畾寰俊 V1.5.3
+     *
+     * @param uid
+     * @param wxUser
+     * @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 forbiddenUser(Long uid, String reason);
 
-	/**
-	 * 灏佺鐢ㄦ埛鎵�鏈変俊鎭細鎵嬫満鍙枫�佸井淇°�佹窐瀹濄�佹敮浠樺疂
-	 * 
-	 * @param uid
-	 * @param reason
-	 */
-	public void forbiddenUserAll(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 DeleteUser(Long uid, String reason);
 
-	/**
-	 * 闀挎椂闂存湭鐧诲綍璐︽埛鍒犻櫎
-	 * 
-	 * @param uid
-	 * @param reason
-	 */
-	public void DeleteUserOutOfDate(Long uid, String reason);
+    /**
+     * 闀挎椂闂存湭鐧诲綍璐︽埛鍒犻櫎
+     *
+     * @param uid
+     * @param reason
+     */
+    public void DeleteUserOutOfDate(Long uid, String reason);
 
-	/**
-	 * 2.0.1 鏂扮櫥褰曟柟寮� -寰俊
-	 * @param ipInfo
-	 * @param acceptData
-	 * @param loginType
-	 * @param wxCode
-	 * @param appId
-	 * @return
-	 * @throws UserAccountException
-	 */
-	public UserInfo loginWeiXinNew(ProxyIP ipInfo, int loginType, String wxCode,
-			BusinessSystem businessSystem) throws UserAccountException;
+    /**
+     * 2.0.1 鏂扮櫥褰曟柟寮� -寰俊
+     *
+     * @param ipInfo
+     * @param acceptData
+     * @param loginType
+     * @param wxCode
+     * @param appId
+     * @return
+     * @throws UserAccountException
+     */
+    public UserInfo loginWeiXinNew(ProxyIP ipInfo, int loginType, String wxCode,
+                                   BusinessSystem businessSystem) throws UserAccountException;
 
-	/**
-	 * 鏈敞鍐屼箣鍓嶇粦瀹氭墜鏈哄彿
-	 * @param ipinfo
-	 * @param acceptData
-	 * @param phone
-	 * @param key
-	 * @return
-	 * @throws UserAccountException
-	 */
-	public UserInfo bindPhoneToLogin(ProxyIP ipinfo, AcceptData acceptData, String phone, String key)
-			throws UserAccountException;
+    /**
+     * 鏈敞鍐屼箣鍓嶇粦瀹氭墜鏈哄彿
+     *
+     * @param ipinfo
+     * @param acceptData
+     * @param phone
+     * @param key
+     * @return
+     * @throws UserAccountException
+     */
+    public UserInfo bindPhoneToLogin(ProxyIP ipinfo, AcceptData acceptData, String phone, String key)
+            throws UserAccountException;
 
-	/**
-	 * 鎵嬫満鐧诲綍闇�瑕佺粦瀹氬井淇�
-	 * @param ipinfo
-	 * @param acceptData
-	 * @param loginType
-	 * @param vcode
-	 * @param phone
-	 * @param appId
-	 * @return
-	 * @throws UserAccountException
-	 */
-	public UserInfo loginPhoneNew(ProxyIP ipinfo, AcceptData acceptData, int loginType, String vcode, String phone, String appId)
-			throws UserAccountException;
+    /**
+     * 鎵嬫満鐧诲綍闇�瑕佺粦瀹氬井淇�
+     *
+     * @param ipinfo
+     * @param acceptData
+     * @param loginType
+     * @param vcode
+     * @param phone
+     * @param appId
+     * @return
+     * @throws UserAccountException
+     */
+    public UserInfo loginPhoneNew(ProxyIP ipinfo, AcceptData acceptData, int loginType, String vcode, String phone, String appId)
+            throws UserAccountException;
 
-	/**
-	 * 缁戝畾寰俊鐧诲綍 + 鎵嬫満鍙穔ey
-	 * @param ipInfo
-	 * @param acceptData
-	 * @param code
-	 * @param appId
-	 * @param key
-	 * @return
-	 * @throws UserAccountException
-	 */
-	public UserInfo bindWXToLogin(ProxyIP ipInfo, AcceptData acceptData, String code, String appId,
-			String key) throws UserAccountException;
+    /**
+     * 缁戝畾寰俊鐧诲綍 + 鎵嬫満鍙穔ey
+     *
+     * @param ipInfo
+     * @param acceptData
+     * @param code
+     * @param appId
+     * @param key
+     * @return
+     * @throws UserAccountException
+     */
+    public UserInfo bindWXToLogin(ProxyIP ipInfo, AcceptData acceptData, String code, String appId,
+                                  String key) throws UserAccountException;
 
 }

--
Gitblit v1.8.0