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/service/inter/money/TeamEincomeRecordService.java |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 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 f956468..d808c26 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,9 @@
 package com.yeshi.fanli.service.inter.money;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
 import com.yeshi.fanli.entity.money.TeamEincomeRecord;
 import com.yeshi.fanli.exception.ParamsException;
 import com.yeshi.fanli.exception.money.TeamEincomeRecordException;
@@ -20,9 +24,46 @@
 	 * void 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public void addTeamEincomeRecord(TeamEincomeRecord record) throws TeamEincomeRecordException,ParamsException;
+	public void addTeamEincomeRecord(TeamEincomeRecord record) throws TeamEincomeRecordException, ParamsException;
+
+	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);
+
+	/**
+	 * 缁熻宸插埌璐﹂噾棰�
+	 * @param uid
+	 * @param type
+	 * @return
+	 */
+	public BigDecimal sumRecieveByType(Long uid, int type);
 
 }

--
Gitblit v1.8.0