From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 4f52495..84feedf 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();
@@ -192,10 +195,40 @@
* @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);
+
+ /**
+ * 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
+ * @param start
+ * @param count
+ * @return
+ */
+ List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
}
\ No newline at end of file
--
Gitblit v1.8.0