From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 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 d8066e4..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,13 +195,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,5 +230,5 @@
 	 * @param count
 	 * @return
 	 */
-	List<Long> getAutoExtractUserIds(@Param("start") int start, @Param("count") int count, @Param("money") BigDecimal money);
+	List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
 }
\ No newline at end of file

--
Gitblit v1.8.0