From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
index dfc593e..0a35449 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
@@ -126,7 +126,7 @@
Collections.reverse(levelList);
- BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date());
+ BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date(),acceptData.getSystem());
moneyBigDecial = MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);
@@ -146,7 +146,7 @@
// 璁＄畻浜岀骇澶栧垎绾�
List<UserTeamRate> moreThan2LevelList = orderHongBaoMoneyComputeService
- .getTeamRewardMoreThan2LevelRates(levelList.get(0), bossList, date);
+ .getTeamRewardMoreThan2LevelRates(levelList.get(0), bossList, date,acceptData.getSystem());
if (moreThan2LevelList != null)
for (UserTeamRate rate : moreThan2LevelList) {
teamReward2Map.put(rate.getUid(), rate);
@@ -154,25 +154,25 @@
// 璁＄畻涓�绾у閲�
if (bossList.size() >= 1) {
- UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1);
+ UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1,acceptData.getSystem());
if (rate != null)
teamRewardMap.put(rate.getUid(), rate);
}
// 璁＄畻浜岀骇濂栭噾
if (bossList.size() >= 2) {
- UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 2);
+ UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 2,acceptData.getSystem());
if (rate != null)
teamRewardMap.put(rate.getUid(), rate);
}
// 璁＄畻鍒嗙孩
- rateList = orderHongBaoMoneyComputeService.getTeamDividentsRates(levelList.get(0), bossList, date);
+ rateList = orderHongBaoMoneyComputeService.getTeamDividentsRates(levelList.get(0), bossList, date,acceptData.getSystem());
if (rateList != null)
for (UserTeamRate rate : rateList) {
teamDividentsMap.put(rate.getUid(), rate);
}
- BigDecimal fanliRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), date);
+ BigDecimal fanliRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), date,acceptData.getSystem());
List<String> resultList = new ArrayList<>();
--
Gitblit v1.8.0