From 0efda3a0ac631642dfe879487d7b93415363bbd4 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 11:41:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
index 909d82c..3a3c31e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
@@ -7,6 +7,7 @@
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.vo.user.UserInfoVO;
public interface UserInfoMapper {
@@ -46,7 +47,14 @@
// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
List<UserInfo> listByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
-
+
+ // 鏍规嵁鑾峰彇鐢佃瘽鍙风爜鏈夋晥鐢ㄦ埛
+ UserInfo getEffectiveUserInfoByPhone(@Param("phone") String phone);
+
+ // 鏍规嵁鑾稺XUnionId鏈夋晥鐢ㄦ埛
+ UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId);
+
+
Long getMaxUid();
/**
@@ -70,12 +78,14 @@
* @param orderMode 鎺掑簭鏂瑰紡
* @return
*/
- List<UserInfo> query(@Param("start") long start, @Param("count") int count, @Param("key") String key,
- @Param("userType")Integer userType, @Param("days")Integer days,
+ List<UserInfoVO> query(@Param("start") long start, @Param("count") int count, @Param("userState")Integer userState,
+ @Param("key") String key, @Param("keyType") Integer keyType,
+ @Param("userRank") String userRank, @Param("days")Integer days,
@Param("startTime") String startTime, @Param("endTime") String endTime,
@Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode);
- long queryCount(@Param("key") String key, @Param("userType")Integer userType, @Param("days")Integer days,
+ long queryCount( @Param("userState")Integer userState, @Param("key") String key, @Param("keyType") Integer keyType,
+ @Param("userRank")String userRank,@Param("days")Integer days,
@Param("startTime") String startTime, @Param("endTime") String endTime);
/**
@@ -166,5 +176,9 @@
* @return
*/
UserInfo getInfoByPhoneOrInviteCode(@Param("phone")String phone, @Param("inviteCode")String inviteCode);
+
+
+ // 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
+ List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);
}
\ No newline at end of file
--
Gitblit v1.8.0