From ee5c8055b1c0dd7c67a9025a76b10bd287c93d9a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 09:52:27 +0800
Subject: [PATCH] 资金明细增加团队分红

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java
index 6655b99..ca1a8a9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java
@@ -110,30 +110,15 @@
 	public BigDecimal computeSecondTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel,
 			UserLevelEnum userLevel);
 
-	/**
-	 * 璁＄畻涓�绾у洟闃熷鍔�
-	 * @Title: computeFirstTeamReward
-	 * @Description: 
-	 * @param firstTeamSubsidy -璐拱鑰呬笂涓�绾у洟闃熻ˉ璐�
-	 * @param secondTeamSubsidy-璐拱鑰呬笂涓ょ骇鍥㈤槦琛ヨ创
-	 * @param userLevel  褰撳墠鐢ㄦ埛鐨勭瓑绾�
-	 * @return 
-	 * BigDecimal 杩斿洖绫诲瀷
-	 * @throws
-	 */
-	public BigDecimal computeFirstTeamReward(BigDecimal firstTeamSubsidy, Date placeOrderTime, UserLevelEnum userLevel);
 
 	/**
-	 * 璁＄畻浜岀骇鍥㈤槦濂栧姳
-	 * @Title: computeSecondTeamReward
-	 * @Description: 
-	 * @param secondTeamSubsidy 璐拱鑰呬笂涓ょ骇鍥㈤槦琛ヨ创
-	 * @param userLevel 褰撳墠鐢ㄦ埛鐨勭瓑绾�
-	 * @return 
-	 * BigDecimal 杩斿洖绫诲瀷
-	 * @throws
+	 * 璁＄畻鍥㈤槦琛ヨ创
+	 * @param date 涓嬪崟鏃堕棿
+	 * @param buyerUserLevel 涓嬪崟鏃� 涓嬪崟浜哄綋鏃剁瓑绾�
+	 * @param userLevel 涓嬪崟鏃� 涓婄骇浜哄搴旂瓑绾�
+	 * @param direct 鏄惁鐩存帴閭�璇峰叧绯�
+	 * @return
 	 */
-	public BigDecimal computeSecondTeamReward(BigDecimal secondTeamSubsidy, Date placeOrderTime,
-			UserLevelEnum userLevel);
+	public BigDecimal getTeamSubsidyRate(Date date, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel, boolean direct);
 
 }

--
Gitblit v1.8.0