From 9e78bd583ce340dbcc1c79c371032e42926cd29c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 三月 2019 09:09:31 +0800
Subject: [PATCH] 删除MaskKeyDao

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 9893872..16d8d50 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
@@ -1,14 +1,13 @@
 package com.yeshi.fanli.service.inter.user;
 
 import java.math.BigDecimal;
-import java.net.ConnectException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.yeshi.fanli.entity.admin.UserInfoAdmin;
 import com.yeshi.fanli.entity.bus.user.InviteUser;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.vo.user.UserInfoVO;
 
 public interface UserInfoService {
 	/**
@@ -109,10 +108,10 @@
 	 * @param orderMode
 	 * @return
 	 */
-	public List<UserInfoAdmin> query(long start, int count, String key, Integer userType, 
+	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);
 
-	public long queryCount(String key, Integer userType, Integer days, String startTime, 
+	public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days, String startTime, 
 			String endTime);
 
 	public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime);
@@ -148,4 +147,12 @@
 	 */
 	public List<Long> longTimeNoLogin(int daysNum, List<Long> list);
 
+	/**
+	 * 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴�
+	 * @param phone
+	 * @param inviteCode
+	 * @return
+	 */
+	public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode);
+
 }

--
Gitblit v1.8.0