From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java |   75 +++++++++++++------------------------
 1 files changed, 27 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..5f0d30c 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
@@ -4,6 +4,7 @@
 import java.util.Date;
 import java.util.List;
 
+import com.yeshi.fanli.dto.ConfigParamsDTO;
 import com.yeshi.fanli.dto.order.UserTeamLevel;
 import com.yeshi.fanli.dto.order.UserTeamRate;
 import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
@@ -15,6 +16,10 @@
  *
  */
 public interface OrderHongBaoMoneyComputeService {
+
+	public ConfigParamsDTO getShowComputeRate(String platform, String version, UserLevelEnum userLevel);
+
+	public ConfigParamsDTO getShowComputeRate(String platform, String version);
 
 	/**
 	 * 鑾峰彇鍩虹鐨勮繑鍒╅噾棰�
@@ -63,6 +68,18 @@
 	public BigDecimal computeShareMoney(CommonOrder order, UserLevelEnum userLevel);
 
 	/**
+	 * 鑾峰彇杩斿埄姣斾緥
+	 * @Title: getFanliRate
+	 * @Description: 
+	 * @param userLevel
+	 * @param date
+	 * @return 
+	 * BigDecimal 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public BigDecimal getFanliRate(UserLevelEnum userLevel, Date date);
+
+	/**
 	 * 璁$畻鐩存帴绮変笣閭�璇峰閲�
 	 * @Title: computeFirstInviteMoney
 	 * @Description: 
@@ -71,7 +88,8 @@
 	 * BigDecimal 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public BigDecimal computeFirstInviteMoney(CommonOrder order, UserLevelEnum buyer);
+	public BigDecimal computeFirstInviteMoney(CommonOrder order, UserLevelEnum buyer,
+			List<UserTeamLevel> bossLevelList);
 
 	/**
 	 * 璁$畻闂存帴绮変笣閭�璇峰閲�
@@ -82,47 +100,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 +115,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 +131,7 @@
 	 * @throws
 	 */
 	public List<UserTeamRate> getTeamRewardMoreThan2LevelRates(UserLevelEnum buyerLevel,
-			List<UserTeamLevel> bossLevelList);
+			List<UserTeamLevel> bossLevelList, Date date);
 
 	/**
 	 * 鑾峰彇鍒嗙孩
@@ -165,8 +144,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 +158,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