From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 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 be6b1d2..2edfbe9 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
@@ -17,7 +17,7 @@
int insertSelective(UserInfo record);
- UserInfo selectByPrimaryKey(Long id);
+ UserInfo selectByPrimaryKey(Long id);
/**
* 鏌ヨ鏈夋晥鐨�
@@ -59,6 +59,9 @@
// 鏍规嵁鑾稺XUnionId鏈夋晥鐢ㄦ埛
UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId);
+
+ //鏍规嵁寰俊openid鏌ヨ
+ UserInfo getEffectiveUserInfoByWXOpenId(@Param("wxOpenId") String wxOpenId);
Long getMaxUid();
@@ -91,11 +94,13 @@
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);
+ @Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode,
+ @Param("userType") Integer userType, @Param("level")String level, @Param("activeCode") Integer activeCode);
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);
+ @Param("endTime") String endTime,@Param("userType") Integer userType, @Param("level")String level,
+ @Param("activeCode") Integer activeCode);
/**
* 缁熻褰撳墠鏌ヨ缁撴灉鎬婚噾棰�
@@ -192,13 +197,34 @@
* @param inviteCode
* @return
*/
- UserInfo getInfoByPhoneOrInviteCode(@Param("phone") String phone, @Param("inviteCode") String inviteCode);
+ UserInfo getUserInfoByInviteCode(@Param("inviteCode") String inviteCode);
// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);
long countAvaiableUser();
-
+
+ /**
+ * 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
+ *
+ * @param start
+ * @param count
+ * @return
+ */
+
+ List<UserInfo> getAutoExtractUser(@Param("start") int start, @Param("count") int count,
+ @Param("money") BigDecimal money, @Param("beganDate") String beganDate, @Param("endDate") String endDate);
+
+ /**
+ * 鏍规嵁type妫�绱�
+ * @param type
+ * @param start
+ * @param count
+ * @return
+ */
+ List<UserInfo> listByType(@Param("type")int type,@Param("start") long start, @Param("count")int count);
+
+ long countByType(int type);
/**
* 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
@@ -206,15 +232,5 @@
* @param count
* @return
*/
- List<UserInfo> getAutoExtractUser(@Param("start") int start, @Param("count") int count, @Param("money") BigDecimal money,
- @Param("beganDate") String beganDate, @Param("endDate") String endDate);
-
-
- /**
- * 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
- * @param start
- * @param count
- * @return
- */
- List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
+ List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
}
\ No newline at end of file
--
Gitblit v1.8.0