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 |   61 +++++++++++++++++-------------
 1 files changed, 34 insertions(+), 27 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 c706326..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
@@ -14,6 +14,28 @@
 public interface OrderHongBaoMoneyComputeService {
 
 	/**
+	 * 鑾峰彇鍩虹鐨勮繑鍒╅噾棰�
+	 * @Title: computeBaseFanliMoney
+	 * @Description: 
+	 * @param order
+	 * @return 
+	 * BigDecimal 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public BigDecimal computeBaseFanliMoney(CommonOrder order);
+
+	/**
+	 * 鑾峰彇鍩虹鐨勫垎浜噾棰�
+	 * @Title: computeBaseShareMoney
+	 * @Description: 
+	 * @param order
+	 * @return 
+	 * BigDecimal 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public BigDecimal computeBaseShareMoney(CommonOrder order);
+
+	/**
 	 * 璁$畻鑷喘璁㈠崟杩斿埄閲戦
 	 * @Title: computeFanliMoney
 	 * @Description: 
@@ -46,7 +68,7 @@
 	 * BigDecimal 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public BigDecimal computeFirstInviteMoney(CommonOrder order,UserLevelEnum buyer);
+	public BigDecimal computeFirstInviteMoney(CommonOrder order, UserLevelEnum buyer);
 
 	/**
 	 * 璁$畻闂存帴绮変笣閭�璇峰閲�
@@ -57,7 +79,7 @@
 	 * BigDecimal 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public BigDecimal computeSecondInviteMoney(CommonOrder order,UserLevelEnum buyer);
+	public BigDecimal computeSecondInviteMoney(CommonOrder order, UserLevelEnum buyer);
 
 	/**
 	 * 璁$畻鐩存帴绮変笣鍥㈤槦琛ヨ创
@@ -70,7 +92,8 @@
 	 * BigDecimal 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public BigDecimal computeFirstTeamSubsidy(BigDecimal fanLiMoney,Date placeOrderTime, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel);
+	public BigDecimal computeFirstTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel,
+			UserLevelEnum userLevel);
 
 	/**
 	 * 璁$畻闂存帴绮変笣鍥㈤槦琛ヨ创
@@ -84,34 +107,18 @@
 	 * @throws
 	 */
 
-	public BigDecimal computeSecondTeamSubsidy(BigDecimal fanLiMoney,Date placeOrderTime, UserLevelEnum buyerUserLevel,
+	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, BigDecimal secondTeamSubsidy,
-			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