From 758a59e77aba29b858698808fedd31c569955357 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 五月 2020 15:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 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 8af63f0..0188cb7 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
@@ -127,8 +127,8 @@
Collections.reverse(levelList);
BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date());
-
- moneyBigDecial=MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);
+
+ moneyBigDecial = MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);
List<UserTeamLevel> bossList = new ArrayList<>();
if (levelList.size() > 1)
@@ -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