From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 24 三月 2020 12:01:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java | 16 ++++++++-------- 1 files changed, 8 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..469cb1a 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 @@ -46,7 +46,7 @@ * BigDecimal 杩斿洖绫诲瀷 * @throws */ - public BigDecimal computeFirstInviteMoney(CommonOrder order,UserLevelEnum buyer); + public BigDecimal computeFirstInviteMoney(CommonOrder order, UserLevelEnum buyer); /** * 璁＄畻闂存帴绮変笣閭�璇峰閲� @@ -57,7 +57,7 @@ * BigDecimal 杩斿洖绫诲瀷 * @throws */ - public BigDecimal computeSecondInviteMoney(CommonOrder order,UserLevelEnum buyer); + public BigDecimal computeSecondInviteMoney(CommonOrder order, UserLevelEnum buyer); /** * 璁＄畻鐩存帴绮変笣鍥㈤槦琛ヨ创 @@ -70,7 +70,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 +85,7 @@ * @throws */ - public BigDecimal computeSecondTeamSubsidy(BigDecimal fanLiMoney,Date placeOrderTime, UserLevelEnum buyerUserLevel, + public BigDecimal computeSecondTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel); /** @@ -98,10 +99,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 +111,7 @@ * BigDecimal 杩斿洖绫诲瀷 * @throws */ - public BigDecimal computeSecondTeamReward(BigDecimal secondTeamSubsidy,Date placeOrderTime, UserLevelEnum userLevel); + public BigDecimal computeSecondTeamReward(BigDecimal secondTeamSubsidy, Date placeOrderTime, + UserLevelEnum userLevel); } -- Gitblit v1.8.0