From 54c250656c2e471ad48ecaa8ccce16ec9d7eb8bd Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 03 十二月 2019 13:52:38 +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 | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 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 97618ae..6905ccd 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 @@ -182,13 +182,32 @@ */ 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); + 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浜� -- Gitblit v1.8.0