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/service/inter/money/TeamEincomeRecordService.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamEincomeRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamEincomeRecordService.java
index 956eda6..348913b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamEincomeRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamEincomeRecordService.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.inter.money;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -25,12 +26,36 @@
 	 */
 	public void addTeamEincomeRecord(TeamEincomeRecord record) throws TeamEincomeRecordException, ParamsException;
 
-	public List<TeamEincomeRecord> listCanRecieveRecord(Date preRecieveTime,Long uid);
+	public List<TeamEincomeRecord> listCanRecieveRecord(Date preRecieveTime, Long uid, List<Integer> typeList);
+
+	/**
+	 * 鑾峰彇鍙互缁撶畻鐨勭敤鎴稩D
+	 * @Title: listCanRecieveUid
+	 * @Description: 
+	 * @param preRecieveTime
+	 * @param typeList
+	 * @return 
+	 * List<Long> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<Long> listCanRecieveUid(Date preRecieveTime, List<Integer> typeList,int page,int pageSize);
 	
+	public long countCanRecieveUid(Date preRecieveTime, List<Integer> typeList);
 	
+
 	public TeamEincomeRecord selectByPrimaryKeyForUpdate(Long id);
-	
-	
+
 	public void setRecieved(Long id);
 
+	/**
+	 * 鑾峰彇棰勪及鍒嗙孩
+	 * @Title: getEstimateDividents
+	 * @Description: 
+	 * @param preGetTime
+	 * @return 
+	 * BigDecimal 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public BigDecimal getEstimateDividents(Date preGetTime, Long uid);
+
 }

--
Gitblit v1.8.0