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 |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 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..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);
 
 	/**
 	 * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛
@@ -182,20 +181,51 @@
 	 */
 	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);
 
 	/**
-	 * 鍙�12棰勫敭寮�鍚椂锛屽紑鍚浼戠湢鑰佺敤鎴风殑鍞ら啋宸ヤ綔锛屽湪2019.1.1鍒�2019.6.18鏈熼棿浜х敓杩囪鍗曪紝骞朵笖2019.6.18鍙峰悗鏈啀娲昏穬锛屽苟涓旇处鎴蜂綑棰濆ぇ浜�1鍏冿紝骞朵笖缁戝畾浜嗗井淇＄殑鐢ㄦ埛鏈�2468浜�
+	 * 鏍规嵁绫诲瀷鑾峰彇
+	 * 
+	 * @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);
 
+	/**
+	 * 鏍规嵁鐢ㄦ埛ID妫�绱�
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	public UserInfo selectAvailableByPrimaryKey(Long uid);
+
+
+
 }

--
Gitblit v1.8.0