From 437ceb214daff5a57253a59a2d8065a088173514 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 13 四月 2020 09:42:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamDividentsDebtService.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamDividentsDebtService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamDividentsDebtService.java
index 0590292..f885045 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamDividentsDebtService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/TeamDividentsDebtService.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.inter.money;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import com.yeshi.fanli.entity.order.dividents.TeamDividentsDebt;
@@ -37,7 +38,7 @@
 	 * @return 杩樺墿涓嬬殑璧勯噾
 	 * @throws TeamDividentsDebtException
 	 */
-	public BigDecimal repayDebtByUid(Long uid, BigDecimal money) throws TeamDividentsDebtException;
+	public BigDecimal repayDebtByUid(Long uid,Date maxEstimatePayTime, BigDecimal money) throws TeamDividentsDebtException;
 
 	/**
 	 * 妫�绱㈤渶瑕佸伩杩樼殑鍊哄姟
@@ -47,7 +48,7 @@
 	 * @param count
 	 * @return
 	 */
-	public List<TeamDividentsDebt> listNeedRepayDebt(Long uid, int page, int count);
+	public List<TeamDividentsDebt> listNeedRepayDebt(Long uid,Date maxEstimatePayTime, int page, int count);
 
 	/**
 	 * 妫�绱㈤渶瑕佸伩杩樼殑鍊哄姟
@@ -55,7 +56,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public long countNeedRepayDebt(Long uid);
+	public long countNeedRepayDebt(Long uid,Date maxEstimatePayTime);
 
 	/**
 	 * 鑾峰彇鎬诲叡娆犻挶閲戦
@@ -63,6 +64,6 @@
 	 * @param uid
 	 * @return
 	 */
-	public BigDecimal getTotalDebtMoney(Long uid);
+	public BigDecimal getTotalDebtMoney(Long uid,Date maxEstimatePayTime);
 
 }

--
Gitblit v1.8.0