From b6c37e4bc38db88a360d0f2c6099183f9bb75bdc Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 14:31:59 +0800
Subject: [PATCH] 券推送插入

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 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 a6419fa..68f2420 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
@@ -5,9 +5,10 @@
 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.exception.user.UserInfoException;
+import com.yeshi.fanli.vo.user.UserInfoVO;
 
 public interface UserInfoService {
 	/**
@@ -108,10 +109,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);
@@ -155,4 +156,26 @@
 	 */
 	public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode);
 
+	/**
+	 * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛
+	 * @param phone
+	 * @return
+	 */
+	public UserInfo getEffectiveUserInfoByPhone(String phone);
+
+	/**
+	 * 鑾峰彇鐢ㄦ埛淇℃伅
+	 * @param uid
+	 * @return
+	 * @throws UserInfoException
+	 */
+	public UserInfo getUserInfo(Long uid) throws UserInfoException;
+
+	/**
+	 * 鏍规嵁寰俊鑾峰彇鏈夋晥鐢ㄦ埛
+	 * @param unionId
+	 * @return
+	 */
+	public UserInfo getEffectiveUserInfoByWXUnionId(String unionId);
+
 }

--
Gitblit v1.8.0