From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 14 十月 2019 17:44:13 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java | 68 +++++++++++++-------------------- 1 files changed, 27 insertions(+), 41 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 06e1671..46aa52c 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 @@ -2,13 +2,10 @@ import java.io.IOException; import java.math.BigDecimal; -import java.util.Date; import java.util.List; -import java.util.Map; import org.springframework.web.multipart.MultipartFile; -import com.yeshi.fanli.entity.bus.user.InviteUser; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.exception.user.UserInfoException; import com.yeshi.fanli.vo.user.UserInfoVO; @@ -56,39 +53,11 @@ 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); @@ -99,7 +68,8 @@ public BigDecimal getNewPeopleHB(Long id); /** - * 鏌ヨ鐢ㄦ埛淇℃伅 -- 鐢ㄦ埛绠＄悊鍒楄〃 + * 鏌ヨ鐢ㄦ埛淇℃伅 -- 鐢ㄦ埛绠＄悊鍒楄〃 + * * @param start * @param count * @param key @@ -110,17 +80,17 @@ * @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); - 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); public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime); - /** * 閫夋嫨鎬ф洿鏂� + * * @param record * @return */ @@ -128,6 +98,7 @@ /** * 鍏跺己鍒跺垹闄ょ粦瀹氫俊鎭� + * * @param user * @param type */ @@ -135,14 +106,15 @@ /** * 鏍规嵁id鏌ヨ鐢ㄦ埛淇℃伅 + * * @param id * @return */ public UserInfo selectByPKey(Long id); - /** - * 瓒呰繃 daysNum 澶╂湭鐧婚檰鐨勭敤鎴� + * 瓒呰繃 daysNum 澶╂湭鐧婚檰鐨勭敤鎴� + * * @param daysNum * @param list * @return @@ -151,6 +123,7 @@ /** * 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴� + * * @param phone * @param inviteCode * @return @@ -159,6 +132,7 @@ /** * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛 + * * @param phone * @return */ @@ -166,6 +140,7 @@ /** * 鑾峰彇鐢ㄦ埛淇℃伅 + * * @param uid * @return * @throws UserInfoException @@ -174,14 +149,15 @@ /** * 鏍规嵁寰俊鑾峰彇鏈夋晥鐢ㄦ埛 + * * @param unionId * @return */ public UserInfo getEffectiveUserInfoByWXUnionId(String unionId); - - + /** * 鑾峰彇鐢ㄦ埛浣欓 + * * @param uid * @return */ @@ -189,6 +165,7 @@ /** * 鏇存崲澶村儚 + * * @param file * @param uid * @throws UserInfoException @@ -198,10 +175,19 @@ /** * 淇濆瓨澶村儚 + * * @param nickName * @param uid * @throws UserInfoException */ public void saveUserInfo(String nickName, Long uid) throws UserInfoException; + + /** + * 鑾峰彇鍙彁鐜扮敤鎴峰垪琛� + * @param page + * @param count + */ + public List<Long> getAutoExtractUserIds(int page, int count, BigDecimal minSurplus); + } -- Gitblit v1.8.0