From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 12:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 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 0a858b1..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,12 +182,39 @@
 	 */
 	public void saveUserInfo(String nickName, Long uid) throws UserInfoException;
 
-	
 	/**
 	 * 鑾峰彇鍙彁鐜扮敤鎴峰垪琛�
+	 * 
 	 * @param page
 	 * @param count
 	 */
-	public List<UserInfo> getAutoExtractUserIds(int page, int count, BigDecimal minSurplus);
+	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);
 
 }

--
Gitblit v1.8.0