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/UserInfoService.java | 140 +++++++++++++++++++++++++++++++--------------- 1 files changed, 95 insertions(+), 45 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 68f2420..d9a3707 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 @@ -1,11 +1,11 @@ package com.yeshi.fanli.service.inter.user; +import java.io.IOException; import java.math.BigDecimal; -import java.util.Date; import java.util.List; -import java.util.Map; -import com.yeshi.fanli.entity.bus.user.InviteUser; +import org.springframework.web.multipart.MultipartFile; + import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.exception.user.UserInfoException; import com.yeshi.fanli.vo.user.UserInfoVO; @@ -53,39 +53,10 @@ public long getUserCount(); - public List<UserInfo> getUserList(int index, String key); - - public int getUserCount(String key); - - public Map<String, Integer> getnewUserByDate(int days, Date date); - - public Map<String, Integer> getnewUserByMonth(int months, Date date); - - public Map<String, Integer> getUserTotalByDate(int days, Date date); - - public Map<String, Integer> getUserTotalByMonth(int months, Date date); - - public List<UserInfo> getUserListByUid(long uid); - - public double getFreezeAssets(double min); - - public double getCanAssets(double min); - - public long getRandomShamUser(); - - public boolean inviteWXUserInfo(String code, UserInfo inviter); public void unBindUserInfo(UserInfo find, int type); public void addMoney(UserInfo userInfo, BigDecimal money); - - public List<UserInfo> findFriends(long id, int type); - - public List<InviteUser> getFriendsList(long id, int type, int page, int pageSize); - - public long getFriendsListCount(long id, int type); - - public int findFriendsCount(long id, int type); public boolean createUser(UserInfo form, String appid); @@ -95,10 +66,9 @@ public BigDecimal getNewPeopleHB(Long id); - public BigDecimal getMyHB(Long id); - /** - * 鏌ヨ鐢ㄦ埛淇℃伅 -- 鐢ㄦ埛绠＄悊鍒楄〃 + * 鏌ヨ鐢ㄦ埛淇℃伅 -- 鐢ㄦ埛绠＄悊鍒楄〃 + * * @param start * @param count * @param key @@ -109,17 +79,18 @@ * @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); + 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); + 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); - /** * 閫夋嫨鎬ф洿鏂� + * * @param record * @return */ @@ -127,6 +98,7 @@ /** * 鍏跺己鍒跺垹闄ょ粦瀹氫俊鎭� + * * @param user * @param type */ @@ -134,14 +106,15 @@ /** * 鏍规嵁id鏌ヨ鐢ㄦ埛淇℃伅 + * * @param id * @return */ public UserInfo selectByPKey(Long id); - /** - * 瓒呰繃 daysNum 澶╂湭鐧婚檰鐨勭敤鎴� + * 瓒呰繃 daysNum 澶╂湭鐧婚檰鐨勭敤鎴� + * * @param daysNum * @param list * @return @@ -149,15 +122,16 @@ public List<Long> longTimeNoLogin(int daysNum, List<Long> list); /** - * 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴� - * @param phone + * 鏍规嵁閭�璇风爜鑾峰彇閭�璇风敤鎴� + * * @param inviteCode * @return */ - public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode); + public UserInfo getUserInfoByInviteCode(String inviteCode); /** * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛 + * * @param phone * @return */ @@ -165,6 +139,7 @@ /** * 鑾峰彇鐢ㄦ埛淇℃伅 + * * @param uid * @return * @throws UserInfoException @@ -173,9 +148,84 @@ /** * 鏍规嵁寰俊鑾峰彇鏈夋晥鐢ㄦ埛 + * * @param unionId * @return */ public UserInfo getEffectiveUserInfoByWXUnionId(String unionId); + /** + * 鑾峰彇鐢ㄦ埛浣欓 + * + * @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 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 type + * @param page + * @param count + * @return + */ + public List<UserInfo> listByType(int type, int page, int count); + + /** + * 鏍规嵁绫诲瀷璁℃暟 + * + * @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); + + /** + * 鏍规嵁鐢ㄦ埛ID妫�绱� + * + * @param uid + * @return + */ + public UserInfo selectAvailableByPrimaryKey(Long uid); + + + } -- Gitblit v1.8.0