From 2ff38cf4200a2235567e8ff6f5560a7026e1f1a6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:08:56 +0800
Subject: [PATCH] 返利比例兼容

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java |   58 ++++++++++------------------------------------------------
 1 files changed, 10 insertions(+), 48 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 363ad20..1ffaae4 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
@@ -71,7 +71,8 @@
 	 * BigDecimal 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public BigDecimal computeFirstInviteMoney(CommonOrder order, UserLevelEnum buyer);
+	public BigDecimal computeFirstInviteMoney(CommonOrder order, UserLevelEnum buyer,
+			List<UserTeamLevel> bossLevelList);
 
 	/**
 	 * 璁＄畻闂存帴绮変笣閭�璇峰閲�
@@ -82,47 +83,8 @@
 	 * BigDecimal 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public BigDecimal computeSecondInviteMoney(CommonOrder order, UserLevelEnum buyer);
-
-	/**
-	 * 璁＄畻鐩存帴绮変笣鍥㈤槦琛ヨ创
-	 * @Title: computeFirstTeamSubsidy
-	 * @Description: 
-	 * @param order
-	 * @param buyerUserLevel
-	 * @param userLevel
-	 * @return 
-	 * BigDecimal 杩斿洖绫诲瀷
-	 * @throws
-	 */
-	public BigDecimal computeFirstTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel,
-			UserLevelEnum userLevel);
-
-	/**
-	 * 璁＄畻闂存帴绮変笣鍥㈤槦琛ヨ创
-	 * @Title: computeSecondTeamSubsidy
-	 * @Description: 
-	 * @param order
-	 * @param buyerUserLevel
-	 * @param userLevel
-	 * @return 
-	 * BigDecimal 杩斿洖绫诲瀷
-	 * @throws
-	 */
-
-	public BigDecimal computeSecondTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel,
-			UserLevelEnum userLevel);
-
-	/**
-	 * 璁＄畻鍥㈤槦琛ヨ创
-	 * @param date 涓嬪崟鏃堕棿
-	 * @param buyerUserLevel 涓嬪崟鏃� 涓嬪崟浜哄綋鏃剁瓑绾�
-	 * @param userLevel 涓嬪崟鏃� 涓婄骇浜哄搴旂瓑绾�
-	 * @param direct 鏄惁鐩存帴閭�璇峰叧绯�
-	 * @return
-	 */
-	public BigDecimal getTeamSubsidyRate(Date date, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel,
-			boolean direct);
+	public BigDecimal computeSecondInviteMoney(CommonOrder order, UserLevelEnum buyer,
+			List<UserTeamLevel> bossLevelList);
 
 	/**
 	 * 鑾峰彇鍥㈤槦濂栭噾
@@ -136,7 +98,7 @@
 	 * BigDecimal 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public UserTeamRate getTeamRewardRate(UserLevelEnum buyerLevel, List<UserTeamLevel> bossLevelList,
+	public UserTeamRate getTeamRewardRate(UserLevelEnum buyerLevel, List<UserTeamLevel> bossLevelList, Date date,
 			int deep);
 
 	/**
@@ -152,7 +114,7 @@
 	 * @throws
 	 */
 	public List<UserTeamRate> getTeamRewardMoreThan2LevelRates(UserLevelEnum buyerLevel,
-			List<UserTeamLevel> bossLevelList);
+			List<UserTeamLevel> bossLevelList, Date date);
 
 	/**
 	 * 鑾峰彇鍒嗙孩
@@ -165,8 +127,8 @@
 	 * List<UserTeamMoney> 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public List<UserTeamRate> getTeamDividentsRates(UserLevelEnum buyerLevel,
-			List<UserTeamLevel> bossLevelList);
+	public List<UserTeamRate> getTeamDividentsRates(UserLevelEnum buyerLevel, List<UserTeamLevel> bossLevelList,
+			Date date);
 
 	/**
 	 * 鑾峰彇璧勬繁瀵煎笀 琛ヨ创
@@ -179,7 +141,7 @@
 	 * UserTeamMoney 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public UserTeamRate getTearcherSubsidy(UserLevelEnum buyerLevel, BigDecimal rate,
-			List<UserTeamLevel> bossLevelList);
+	public UserTeamRate getTearcherSubsidy(UserLevelEnum buyerLevel, BigDecimal rate, List<UserTeamLevel> bossLevelList,
+			Date date);
 
 }

--
Gitblit v1.8.0