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/money/TeamEincomeRecordMapper.java |   19 ++++++++++++++++++-
 1 files changed, 18 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..a3046f1 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
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.dao.mybatis.money;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -16,5 +17,21 @@
 	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);
+
+	
+	/**
+	 * 缁熻绫诲瀷宸查鍙栭噾棰�
+	 * @param uid
+	 * @param type
+	 * @return
+	 */
+	BigDecimal sumRecieveByType(@Param("uid") Long uid,@Param("type") int type);
 }
\ No newline at end of file

--
Gitblit v1.8.0