From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |  395 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 204 insertions(+), 191 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
index 5767ddb..a9241f9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
@@ -4,6 +4,8 @@
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.yeshi.fanli.entity.SystemEnum;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -11,229 +13,240 @@
 import com.yeshi.fanli.vo.user.UserInfoVO;
 
 public interface UserInfoService {
-	/**
-	 * 閫氳繃openid鍜宭oginType,鑾峰彇鐢ㄦ埛
-	 * 
-	 * @param loginType
-	 *            1:闃块噷绯诲垪锛堟窐瀹濓級璐︽埛
-	 * @param openid
-	 *            :鐧诲綍娣樺疂鍚庡緱鍒扮殑openid
-	 * @param appid
-	 * @return 鐢ㄦ埛锛屽鏋滀笉瀛樺湪杩斿洖null
-	 */
-	public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid);
+    /**
+     * 閫氳繃openid鍜宭oginType,鑾峰彇鐢ㄦ埛
+     *
+     * @param loginType 1:闃块噷绯诲垪锛堟窐瀹濓級璐︽埛
+     * @param openid    :鐧诲綍娣樺疂鍚庡緱鍒扮殑openid
+     * @param appid
+     * @return 鐢ㄦ埛锛屽鏋滀笉瀛樺湪杩斿洖null
+     */
+    /**
+     *
+     * @param loginType
+     * @param openid
+     * @param sysetm
+     * @return
+     */
+    public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, SystemEnum sysetm);
 
-	/**
-	 * 娣诲姞鐢ㄦ埛
-	 * 
-	 * @param form
-	 *            鐢ㄦ埛淇℃伅
-	 * @return 鐢ㄦ埛,娣诲姞澶辫触杩斿洖null
-	 */
-	public UserInfo addUser(UserInfo form, String appid);
+    /**
+     * 娣诲姞鐢ㄦ埛
+     *
+     * @param form 鐢ㄦ埛淇℃伅
+     * @return 鐢ㄦ埛, 娣诲姞澶辫触杩斿洖null
+     */
+    public UserInfo addUser(UserInfo form, SystemEnum sysetm);
 
-	/**
-	 * 閫氳繃鐢ㄦ埛id鑾峰彇鐢ㄦ埛
-	 * 
-	 * @param uid
-	 *            鐢ㄦ埛id
-	 * @return 鐢ㄦ埛
-	 */
-	public UserInfo getUserById(long uid);
+    /**
+     * 閫氳繃鐢ㄦ埛id鑾峰彇鐢ㄦ埛
+     *
+     * @param uid 鐢ㄦ埛id
+     * @return 鐢ㄦ埛
+     */
+    public UserInfo getUserById(long uid);
 
-	/**
-	 * Mybatis閫氳繃鐢ㄦ埛ID鑾峰彇鐢ㄦ埛淇℃伅
-	 * 
-	 * @param uid
-	 * @return
-	 */
-	public UserInfo getUserByIdWithMybatis(long uid);
+    /**
+     * Mybatis閫氳繃鐢ㄦ埛ID鑾峰彇鐢ㄦ埛淇℃伅
+     *
+     * @param uid
+     * @return
+     */
+    public UserInfo getUserByIdWithMybatis(long uid);
 
-	public void update(UserInfo user);
+    public void update(UserInfo user);
 
-	public long getUserCount();
+    public long getUserCount();
 
 
-	public void unBindUserInfo(UserInfo find, int type);
+    public void unBindUserInfo(UserInfo find, int type);
 
-	public void addMoney(UserInfo userInfo, BigDecimal money);
+    public void addMoney(UserInfo userInfo, BigDecimal money);
 
-	public boolean createUser(UserInfo form, String appid);
+    public boolean createUser(UserInfo form, SystemEnum sysetm);
 
-	public void updateLoginInfo(UserInfo user);
+    public void updateLoginInfo(UserInfo user);
 
-	public void cleanPassword(long id);
+    public void cleanPassword(long id);
 
-	public BigDecimal getNewPeopleHB(Long id);
+    public BigDecimal getNewPeopleHB(Long id);
 
-	/**
-	 * 鏌ヨ鐢ㄦ埛淇℃伅 -- 鐢ㄦ埛绠$悊鍒楄〃
-	 * 
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @param userType
-	 * @param days
-	 * @param startTime
-	 * @param endTime
-	 * @param orderMode
-	 * @return
-	 */
-	public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType,
-			String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,
-			Integer userType, String level, Integer activeCode);
+    /**
+     * 鏌ヨ鐢ㄦ埛淇℃伅 -- 鐢ㄦ埛绠$悊鍒楄〃
+     *
+     * @param start
+     * @param count
+     * @param key
+     * @param userType
+     * @param days
+     * @param startTime
+     * @param endTime
+     * @param orderMode
+     * @return
+     */
+    public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType,
+                                  String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,
+                                  Integer userType, String level, Integer activeCode);
 
-	public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,
-			String startTime, String endTime, Integer userType, String level, Integer activeCode);
+    public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,
+                           String startTime, String endTime, Integer userType, String level, Integer activeCode);
 
-	public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime);
+    public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime);
 
-	/**
-	 * 閫夋嫨鎬ф洿鏂�
-	 * 
-	 * @param record
-	 * @return
-	 */
-	public int updateByPrimaryKeySelective(UserInfo record);
+    /**
+     * 閫夋嫨鎬ф洿鏂�
+     *
+     * @param record
+     * @return
+     */
+    public int updateByPrimaryKeySelective(UserInfo record);
 
-	/**
-	 * 鍏跺己鍒跺垹闄ょ粦瀹氫俊鎭�
-	 * 
-	 * @param user
-	 * @param type
-	 */
-	public void deleteBindInfo(UserInfo user, int type);
+    /**
+     * 鍏跺己鍒跺垹闄ょ粦瀹氫俊鎭�
+     *
+     * @param user
+     * @param type
+     */
+    public void deleteBindInfo(UserInfo user, int type);
 
-	/**
-	 * 鏍规嵁id鏌ヨ鐢ㄦ埛淇℃伅
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public UserInfo selectByPKey(Long id);
+    /**
+     * 鏍规嵁id鏌ヨ鐢ㄦ埛淇℃伅
+     *
+     * @param id
+     * @return
+     */
+    public UserInfo selectByPKey(Long id);
 
-	/**
-	 * 瓒呰繃 daysNum 澶╂湭鐧婚檰鐨勭敤鎴�
-	 * 
-	 * @param daysNum
-	 * @param list
-	 * @return
-	 */
-	public List<Long> longTimeNoLogin(int daysNum, List<Long> list);
+    /**
+     * 瓒呰繃 daysNum 澶╂湭鐧婚檰鐨勭敤鎴�
+     *
+     * @param daysNum
+     * @param list
+     * @return
+     */
+    public List<Long> longTimeNoLogin(int daysNum, List<Long> list);
 
-	/**
-	 * 鏍规嵁閭�璇风爜鑾峰彇閭�璇风敤鎴�
-	 * 
-	 * @param inviteCode
-	 * @return
-	 */
-	public UserInfo getUserInfoByInviteCode(String inviteCode);
+    /**
+     * 鏍规嵁閭�璇风爜鑾峰彇閭�璇风敤鎴�
+     *
+     * @param inviteCode
+     * @return
+     */
+    public UserInfo getUserInfoByInviteCode(String inviteCode);
 
-	/**
-	 * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛
-	 * 
-	 * @param phone
-	 * @return
-	 */
-	public UserInfo getEffectiveUserInfoByPhone(String phone);
+    /**
+     * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛
+     *
+     * @param phone
+     * @return
+     */
+    public UserInfo getEffectiveUserInfoByPhone(String phone, SystemEnum sysetm);
 
-	/**
-	 * 鑾峰彇鐢ㄦ埛淇℃伅
-	 * 
-	 * @param uid
-	 * @return
-	 * @throws UserInfoException
-	 */
-	public UserInfo getUserInfo(Long uid) throws UserInfoException;
+    /**
+     * 鑾峰彇鐢ㄦ埛淇℃伅
+     *
+     * @param uid
+     * @return
+     * @throws UserInfoException
+     */
+    public UserInfo getUserInfo(Long uid) throws UserInfoException;
 
-	/**
-	 * 鏍规嵁寰俊鑾峰彇鏈夋晥鐢ㄦ埛
-	 * 
-	 * @param unionId
-	 * @return
-	 */
-	public UserInfo getEffectiveUserInfoByWXUnionId(String unionId);
+    /**
+     * 鏍规嵁寰俊鑾峰彇鏈夋晥鐢ㄦ埛
+     *
+     * @param unionId
+     * @return
+     */
+    public UserInfo getEffectiveUserInfoByWXUnionId(String unionId, SystemEnum sysetm);
 
-	/**
-	 * 鑾峰彇鐢ㄦ埛浣欓
-	 * 
-	 * @param uid
-	 * @return
-	 */
-	public BigDecimal getBalance(Long uid);
+    /**
+     * 鑾峰彇鐢ㄦ埛浣欓
+     *
+     * @param uid
+     * @return
+     */
+    public BigDecimal getBalance(Long uid);
 
-	/**
-	 * 鏇存崲澶村儚
-	 * 
-	 * @param file
-	 * @param uid
-	 * @throws UserInfoException
-	 * @throws IOException
-	 */
-	public void uploadPortrait(MultipartFile file, Long uid) throws UserInfoException, IOException;
+    /**
+     * 鏇存崲澶村儚
+     *
+     * @param file
+     * @param uid
+     * @throws UserInfoException
+     * @throws IOException
+     */
+    public void uploadPortrait(MultipartFile file, Long uid) throws UserInfoException, IOException;
 
-	/**
-	 * 淇濆瓨澶村儚
-	 * 
-	 * @param nickName
-	 * @param uid
-	 * @throws UserInfoException
-	 */
-	public void saveUserInfo(String nickName, Long uid) throws UserInfoException;
+    /**
+     * 淇濆瓨澶村儚
+     *
+     * @param nickName
+     * @param uid
+     * @throws UserInfoException
+     */
+    public void saveUserInfo(String nickName, Long uid) throws UserInfoException;
 
-	/**
-	 * 鑾峰彇鍙彁鐜扮敤鎴峰垪琛�
-	 * 
-	 * @param page
-	 * @param count
-	 */
-	public List<UserInfo> getAutoExtractUser(int page, int count, BigDecimal minSurplus, String beganDate,
-			String endDate);
+    /**
+     * 鑾峰彇鍙彁鐜扮敤鎴峰垪琛�
+     *
+     * @param page
+     * @param count
+     */
+    public List<UserInfo> getAutoExtractUser(int page, int count, BigDecimal minSurplus, String beganDate,
+                                             String endDate);
 
-	/**
-	 * 鏍规嵁绫诲瀷鑾峰彇
-	 * 
-	 * @param type
-	 * @param page
-	 * @param count
-	 * @return
-	 */
-	public List<UserInfo> listByType(int type, int page, int count);
+    /**
+     * 鏍规嵁绫诲瀷鑾峰彇
+     *
+     * @param type
+     * @param page
+     * @param count
+     * @return
+     */
+    public List<UserInfo> listByType(int type, int page, int count);
 
-	/**
-	 * 鏍规嵁绫诲瀷璁℃暟
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public long countByType(int type);
+    /**
+     * 鏍规嵁绫诲瀷璁℃暟
+     *
+     * @param type
+     * @return
+     */
+    public long countByType(int type);
 
-	/**
-	 * 鍙�12棰勫敭寮�鍚椂锛屽紑鍚浼戠湢鑰佺敤鎴风殑鍞ら啋宸ヤ綔锛屽湪2019.1.1鍒�2019.6.18鏈熼棿浜х敓杩囪鍗曪紝骞朵笖2019.6.18鍙峰悗鏈啀娲昏穬锛�
-	 * 骞朵笖璐︽埛浣欓澶т簬1鍏冿紝骞朵笖缁戝畾浜嗗井淇$殑鐢ㄦ埛鏈�2468浜�
-	 * 
-	 * @param start
-	 * @param count
-	 * @return
-	 */
-	public List<UserInfo> getAutoExtractUserTo1212(int start, int count);
+    /**
+     * 鍙�12棰勫敭寮�鍚椂锛屽紑鍚浼戠湢鑰佺敤鎴风殑鍞ら啋宸ヤ綔锛屽湪2019.1.1鍒�2019.6.18鏈熼棿浜х敓杩囪鍗曪紝骞朵笖2019.6.18鍙峰悗鏈啀娲昏穬锛�
+     * 骞朵笖璐︽埛浣欓澶т簬1鍏冿紝骞朵笖缁戝畾浜嗗井淇$殑鐢ㄦ埛鏈�2468浜�
+     *
+     * @param start
+     * @param count
+     * @return
+     */
+    public List<UserInfo> getAutoExtractUserTo1212(int start, int count);
 
-	/**
-	 * 鏍规嵁鐢ㄦ埛ID妫�绱�
-	 * 
-	 * @param uid
-	 * @return
-	 */
-	public UserInfo selectAvailableByPrimaryKey(Long uid);
-
-	
-	
-	public long countInfo(Integer userState, String key, Integer keyType, String userRank, Integer days, String startTime,
-			String endTime, Integer userType, String level, Integer activeCode);
-
-	public List<UserInfoVO> queryInfo(long start, int count, Integer userState, String key, Integer keyType, String userRank,
-			Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode);
+    /**
+     * 鏍规嵁鐢ㄦ埛ID妫�绱�
+     *
+     * @param uid
+     * @return
+     */
+    public UserInfo selectAvailableByPrimaryKey(Long uid);
 
 
+    public long countInfo(Integer userState, String key, Integer keyType, String userRank, Integer days, String startTime,
+                          String endTime, Integer userType, String level, Integer activeCode);
 
+    public List<UserInfoVO> queryInfo(long start, int count, Integer userState, String key, Integer keyType, String userRank,
+                                      Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode);
+
+
+    List<UserInfo> listBySystemAndWXUnionId(SystemEnum system, String unionId);
+    List<UserInfo> listBySystemAndTaoBaoOpenId(SystemEnum system, String openId);
+    List<UserInfo> listBySystemAndPhone(SystemEnum system, String phone);
+
+    /**
+     * 鏍规嵁鐢ㄦ埛ID鑾峰彇鎵�鍦ㄧ郴缁�
+     * @param uid
+     * @return
+     */
+    public SystemEnum getUserSystem(Long uid);
 }

--
Gitblit v1.8.0