From d4588f4e43336b26b356b869c29d0c76390167d5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 10:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 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 469cb1a..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:
@@ -88,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