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 | 13 +++++++------ 1 files changed, 7 insertions(+), 6 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 bce3f52..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 @@ -53,7 +53,6 @@ public long getUserCount(); - public boolean inviteWXUserInfo(String code, UserInfo inviter); public void unBindUserInfo(UserInfo find, int type); @@ -81,10 +80,11 @@ * @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); + 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); + String startTime, String endTime, Integer userType, String level, Integer activeCode); public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime); @@ -122,13 +122,12 @@ 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); /** * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛 @@ -227,4 +226,6 @@ */ public UserInfo selectAvailableByPrimaryKey(Long uid); + + } -- Gitblit v1.8.0