From b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 23 二月 2020 00:16:52 +0800
Subject: [PATCH] 2.0.7相关服务端功能添加

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 bce3f52..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);
 
@@ -122,13 +124,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);
 
 	/**
 	 * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛
@@ -227,4 +228,6 @@
 	 */
 	public UserInfo selectAvailableByPrimaryKey(Long uid);
 
+
+
 }

--
Gitblit v1.8.0