From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001 From: yj <Administrator@192> Date: 星期五, 13 三月 2020 16:31:30 +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 | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 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 86862f6..8492404 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 @@ -6,6 +6,7 @@ import org.springframework.web.multipart.MultipartFile; +import com.yeshi.fanli.dto.user.UserInviteLevelEnum; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.exception.user.UserInfoException; import com.yeshi.fanli.vo.user.UserInfoVO; @@ -81,10 +82,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); public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days, - String startTime, String endTime); + String startTime, String endTime, Integer userType); public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime); @@ -209,11 +211,23 @@ public long countByType(int type); /** - * 鍙�12棰勫敭寮�鍚椂锛屽紑鍚浼戠湢鑰佺敤鎴风殑鍞ら啋宸ヤ綔锛屽湪2019.1.1鍒�2019.6.18鏈熼棿浜х敓杩囪鍗曪紝骞朵笖2019.6.18鍙峰悗鏈啀娲昏穬锛屽苟涓旇处鎴蜂綑棰濆ぇ浜�1鍏冿紝骞朵笖缁戝畾浜嗗井淇＄殑鐢ㄦ埛鏈�2468浜� + * 鍙�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