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/money/TeamEincomeRecordMapper.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
index aa1d325..a13abf0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
@@ -16,5 +16,13 @@
 	TeamEincomeRecord selectByPrimaryKeyForUpdate(Long id);
 
 	List<TeamEincomeRecord> listByUidAndPreRecieveTimeAndState(@Param("uid") Long uid,
-			@Param("preRecieveTime") Date preRecieveTime, @Param("state") int state);
+			@Param("preRecieveTime") Date preRecieveTime, @Param("typeList") List<Integer> typeList,
+			@Param("state") int state);
+
+	public List<Long> listCanRecieveUid(@Param("preRecieveTime") Date preRecieveTime,
+			@Param("typeList") List<Integer> typeList,@Param("start") long start,@Param("count")int count);
+
+	public long countCanRecieveUid(@Param("preRecieveTime") Date preRecieveTime,
+			@Param("typeList") List<Integer> typeList);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0