From bbb7a538df960f2f47b0af8c3db03622fca08d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 五月 2020 13:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 27f1667..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,8 +119,6 @@
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++)
@@ -128,6 +126,10 @@
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)
for (int i = 1; i < levelList.size(); i++) {
--
Gitblit v1.8.0