From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 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 85112d8..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
@@ -64,7 +64,7 @@
String version = acceptData.getVersion();
AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type, platform,
- Integer.parseInt(version));
+ Integer.parseInt(version),acceptData.getSystem());
if ("home".equalsIgnoreCase(type) && VersionUtil.smallerThan_1_5_1(platform, version) && ap != null) {
AppPageNotification no = new AppPageNotification();
no.setContentUrl("");
@@ -126,9 +126,9 @@
Collections.reverse(levelList);
- BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date());
-
- moneyBigDecial=MoneyBigDecimalUtil.div(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);
+ BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date(),acceptData.getSystem());
+
+ moneyBigDecial = MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);
List<UserTeamLevel> bossList = new ArrayList<>();
if (levelList.size() > 1)
@@ -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<>();
@@ -184,27 +184,21 @@
String st = "";
Long uid = bossList.get(i).getUid();
- if (i < 2) {
- if (teamRewardMap.get(uid) == null)
- st += "楼0";
- else
- st += "楼" + MoneyBigDecimalUtil.div(
- MoneyBigDecimalUtil.mul(moneyBigDecial, teamRewardMap.get(uid).getRate()),
- new BigDecimal(100));
+ if (teamRewardMap.get(uid) == null)
+ st += "楼0";
+ else
+ st += "楼" + MoneyBigDecimalUtil.div(
+ MoneyBigDecimalUtil.mul(moneyBigDecial, teamRewardMap.get(uid).getRate()), new BigDecimal(100));
- st += "+";
- }
+ st += "+";
- if (i >= 2) {
-
- if (teamReward2Map.get(uid) == null)
- st += "楼0";
- else
- st += "楼" + MoneyBigDecimalUtil.div(
- MoneyBigDecimalUtil.mul(moneyBigDecial, teamReward2Map.get(uid).getRate()),
- new BigDecimal(100));
- st += "+";
- }
+ if (teamReward2Map.get(uid) == null)
+ st += "楼0";
+ else
+ st += "楼" + MoneyBigDecimalUtil.div(
+ MoneyBigDecimalUtil.mul(moneyBigDecial, teamReward2Map.get(uid).getRate()),
+ new BigDecimal(100));
+ st += "+";
if (teamDividentsMap.get(uid) == null)
st += "楼0";
--
Gitblit v1.8.0