From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
index eaf3d24..384a93e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
@@ -119,12 +119,16 @@
 	List<HongBaoV2> listCanBalanceHongBaoByType(@Param("type") int type, @Param("count") int count);
 
 	/**
-	 * 鑾峰彇鑳藉缁撶畻鐨勫垎浜禋鍜岄個璇疯禋鐨勭敤鎴峰垪琛�
+	 * 鑾峰彇鑳藉缁撶畻鐨勭孩鍖呯殑鐢ㄦ埛鍒楄〃
 	 * 
 	 * @param count
 	 * @return
 	 */
-	List<Long> listUidCanBanlanceShareAndInvite(int count);
+	List<Long> listUidCanBanlanceByTypeAndMaxTime(@Param("typeList") List<Integer> typeList,
+			@Param("maxTime") Date maxTime, @Param("start") long start, @Param("count") int count);
+
+	long countUidCanBanlanceByTypeAndMaxTime(@Param("typeList") List<Integer> typeList,
+			@Param("maxTime") Date maxTime);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岀被鍨嬭幏鍙栬兘澶熺粨绠楃殑绾㈠寘

--
Gitblit v1.8.0