From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 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 5e711ce..8af63f0 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
@@ -119,14 +119,16 @@
return;
}
- moneyBigDecial = MoneyBigDecimalUtil.mul(moneyBigDecial, new BigDecimal("2.5"));
-
List<UserLevelEnum> levelList = new ArrayList<UserLevelEnum>();
net.sf.json.JSONArray array = net.sf.json.JSONArray.fromObject(list);
for (int i = 0; i < array.size(); i++)
levelList.add(UserLevelEnum.valueOf(array.optString(i)));
Collections.reverse(levelList);
+
+ BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date());
+
+ moneyBigDecial=MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);
List<UserTeamLevel> bossList = new ArrayList<>();
if (levelList.size() > 1)
@@ -151,14 +153,14 @@
}
// 璁＄畻涓�绾у閲�
- if (bossList.size() > 1) {
+ if (bossList.size() >= 1) {
UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1);
if (rate != null)
teamRewardMap.put(rate.getUid(), rate);
}
// 璁＄畻浜岀骇濂栭噾
- if (bossList.size() > 2) {
- UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1);
+ if (bossList.size() >= 2) {
+ UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 2);
if (rate != null)
teamRewardMap.put(rate.getUid(), rate);
}
@@ -182,27 +184,39 @@
String st = "";
Long uid = bossList.get(i).getUid();
- if (teamRewardMap.get(uid) == null)
- st += "楼0";
- else
- st += "楼" + teamRewardMap.get(uid);
+ if (i < 2) {
+ if (teamRewardMap.get(uid) == null)
+ st += "楼0";
+ else
+ st += "楼" + MoneyBigDecimalUtil.div(
+ MoneyBigDecimalUtil.mul(moneyBigDecial, teamRewardMap.get(uid).getRate()),
+ new BigDecimal(100));
- st += "+";
+ st += "+";
+ }
- if (teamReward2Map.get(uid) == null)
- st += "楼0";
- else
- st += "楼" + teamReward2Map.get(uid);
+ if (i >= 2) {
- 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";
else
- st += "楼" + teamDividentsMap.get(uid);
+ st += "楼" + MoneyBigDecimalUtil.div(
+ MoneyBigDecimalUtil.mul(moneyBigDecial, teamDividentsMap.get(uid).getRate()),
+ new BigDecimal(100));
resultList.add(st);
}
+ Collections.reverse(resultList);
+
JSONObject data = new JSONObject();
data.put("list", resultList);
--
Gitblit v1.8.0