From 2bd2200f209ddb7bcc59b636d9de6f8b3f762958 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 10:00:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java |   78 +++++++++++++++++++++++++++++++--------
 1 files changed, 62 insertions(+), 16 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..363ad20 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
@@ -2,7 +2,10 @@
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
+import com.yeshi.fanli.dto.order.UserTeamLevel;
+import com.yeshi.fanli.dto.order.UserTeamRate;
 import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
 import com.yeshi.fanli.entity.order.CommonOrder;
 
@@ -111,29 +114,72 @@
 			UserLevelEnum userLevel);
 
 	/**
-	 * 璁＄畻涓�绾у洟闃熷鍔�
-	 * @Title: computeFirstTeamReward
-	 * @Description: 
-	 * @param firstTeamSubsidy -璐拱鑰呬笂涓�绾у洟闃熻ˉ璐�
-	 * @param secondTeamSubsidy-璐拱鑰呬笂涓ょ骇鍥㈤槦琛ヨ创
-	 * @param userLevel  褰撳墠鐢ㄦ埛鐨勭瓑绾�
-	 * @return 
-	 * BigDecimal 杩斿洖绫诲瀷
-	 * @throws
+	 * 璁＄畻鍥㈤槦琛ヨ创
+	 * @param date 涓嬪崟鏃堕棿
+	 * @param buyerUserLevel 涓嬪崟鏃� 涓嬪崟浜哄綋鏃剁瓑绾�
+	 * @param userLevel 涓嬪崟鏃� 涓婄骇浜哄搴旂瓑绾�
+	 * @param direct 鏄惁鐩存帴閭�璇峰叧绯�
+	 * @return
 	 */
-	public BigDecimal computeFirstTeamReward(BigDecimal firstTeamSubsidy, Date placeOrderTime, UserLevelEnum userLevel);
+	public BigDecimal getTeamSubsidyRate(Date date, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel,
+			boolean direct);
 
 	/**
-	 * 璁＄畻浜岀骇鍥㈤槦濂栧姳
-	 * @Title: computeSecondTeamReward
+	 * 鑾峰彇鍥㈤槦濂栭噾
+	 * @Title: getTeamReward
 	 * @Description: 
-	 * @param secondTeamSubsidy 璐拱鑰呬笂涓ょ骇鍥㈤槦琛ヨ创
-	 * @param userLevel 褰撳墠鐢ㄦ埛鐨勭瓑绾�
+	 * @param buyerLevel
+	 * @param money
+	 * @param levelList
+	 * @param deep 1-鐩存帴濂栭噾  2-闂存帴濂栭噾
 	 * @return 
 	 * BigDecimal 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public BigDecimal computeSecondTeamReward(BigDecimal secondTeamSubsidy, Date placeOrderTime,
-			UserLevelEnum userLevel);
+	public UserTeamRate getTeamRewardRate(UserLevelEnum buyerLevel, List<UserTeamLevel> bossLevelList,
+			int deep);
+
+	/**
+	 * 鑾峰彇浜岀骇澶栫殑鍥㈤槦濂栭噾
+	 * @Title: getTeamRewardMoreThan2Level
+	 * @Description: 
+	 * @param buyerLevel
+	 * @param money
+	 * @param bossLevelList
+	 * @param deep
+	 * @return 
+	 * UserTeamMoney 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<UserTeamRate> getTeamRewardMoreThan2LevelRates(UserLevelEnum buyerLevel,
+			List<UserTeamLevel> bossLevelList);
+
+	/**
+	 * 鑾峰彇鍒嗙孩
+	 * @Title: getTeamDividents
+	 * @Description: 
+	 * @param buyerLevel
+	 * @param money
+	 * @param bossLevelList
+	 * @return 
+	 * List<UserTeamMoney> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<UserTeamRate> getTeamDividentsRates(UserLevelEnum buyerLevel,
+			List<UserTeamLevel> bossLevelList);
+
+	/**
+	 * 鑾峰彇璧勬繁瀵煎笀 琛ヨ创
+	 * @Title: getTearcherSubsidy
+	 * @Description: 
+	 * @param buyerLevel
+	 * @param money
+	 * @param bossLevelList
+	 * @return 
+	 * UserTeamMoney 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public UserTeamRate getTearcherSubsidy(UserLevelEnum buyerLevel, BigDecimal rate,
+			List<UserTeamLevel> bossLevelList);
 
 }

--
Gitblit v1.8.0