From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |   82 ++++++++++++++++++++++-------------------
 1 files changed, 44 insertions(+), 38 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 00dc1a1..e246837 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
@@ -2,13 +2,10 @@
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import org.springframework.web.multipart.MultipartFile;
 
-import com.yeshi.fanli.entity.bus.user.InviteUser;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.exception.user.UserInfoException;
 import com.yeshi.fanli.vo.user.UserInfoVO;
@@ -56,39 +53,11 @@
 
 	public long getUserCount();
 
-	public List<UserInfo> getUserList(int index, String key);
-
-	public int getUserCount(String key);
-
-	public Map<String, Integer> getnewUserByDate(int days, Date date);
-
-	public Map<String, Integer> getnewUserByMonth(int months, Date date);
-
-	public Map<String, Integer> getUserTotalByDate(int days, Date date);
-
-	public Map<String, Integer> getUserTotalByMonth(int months, Date date);
-
-	public List<UserInfo> getUserListByUid(long uid);
-
-	public double getFreezeAssets(double min);
-
-	public double getCanAssets(double min);
-
-	public long getRandomShamUser();
-
 	public boolean inviteWXUserInfo(String code, UserInfo inviter);
 
 	public void unBindUserInfo(UserInfo find, int type);
 
 	public void addMoney(UserInfo userInfo, BigDecimal money);
-
-	public List<UserInfo> findFriends(long id, int type);
-
-	public List<InviteUser> getFriendsList(long id, int type, int page, int pageSize);
-
-	public long getFriendsListCount(long id, int type);
-
-	public int findFriendsCount(long id, int type);
 
 	public boolean createUser(UserInfo form, String appid);
 
@@ -112,10 +81,10 @@
 	 * @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);
 
@@ -153,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);
 
 	/**
 	 * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛
@@ -214,10 +182,48 @@
 	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);
+
+	/**
+	 * 鏍规嵁绫诲瀷鑾峰彇
+	 * 
+	 * @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 void forbiddenUser(Long uid,String reason);
+	public UserInfo selectAvailableByPrimaryKey(Long uid);
 
 }

--
Gitblit v1.8.0