From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 13 四月 2020 10:04:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 40 insertions(+), 8 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..89dcaf0 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,7 +107,7 @@ * @throws */ - public BigDecimal computeSecondTeamSubsidy(BigDecimal fanLiMoney,Date placeOrderTime, UserLevelEnum buyerUserLevel, + public BigDecimal computeSecondTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel); /** @@ -98,10 +121,8 @@ * BigDecimal 杩斿洖绫诲瀷 * @throws */ - public BigDecimal computeFirstTeamReward(BigDecimal firstTeamSubsidy,Date placeOrderTime, BigDecimal secondTeamSubsidy, - UserLevelEnum userLevel); + public BigDecimal computeFirstTeamReward(BigDecimal firstTeamSubsidy, Date placeOrderTime, UserLevelEnum userLevel); - /** * 璁$畻浜岀骇鍥㈤槦濂栧姳 * @Title: computeSecondTeamReward @@ -112,6 +133,17 @@ * BigDecimal 杩斿洖绫诲瀷 * @throws */ - public BigDecimal computeSecondTeamReward(BigDecimal secondTeamSubsidy,Date placeOrderTime, UserLevelEnum userLevel); + public BigDecimal computeSecondTeamReward(BigDecimal secondTeamSubsidy, Date placeOrderTime, + UserLevelEnum userLevel); + + /** + * 璁$畻鍥㈤槦琛ヨ创 + * @param date 涓嬪崟鏃堕棿 + * @param buyerUserLevel 涓嬪崟鏃� 涓嬪崟浜哄綋鏃剁瓑绾� + * @param userLevel 涓嬪崟鏃� 涓婄骇浜哄搴旂瓑绾� + * @param direct 鏄惁鐩存帴閭�璇峰叧绯� + * @return + */ + public BigDecimal getTeamSubsidyRate(Date date, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel, boolean direct); } -- Gitblit v1.8.0