From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 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..fe23d80 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
@@ -27,7 +27,7 @@
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.manger.AppUpdateManager;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
@@ -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("");
@@ -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(),acceptData.getSystem());
+
+ moneyBigDecial = MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);
List<UserTeamLevel> bossList = new ArrayList<>();
if (levelList.size() > 1)
@@ -144,33 +146,33 @@
// 璁＄畻浜岀骇澶栧垎绾�
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);
}
// 璁＄畻涓�绾у閲�
- if (bossList.size() > 1) {
- UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1);
+ if (bossList.size() >= 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, 1);
+ if (bossList.size() >= 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<>();
@@ -185,24 +187,30 @@
if (teamRewardMap.get(uid) == null)
st += "楼0";
else
- st += "楼" + teamRewardMap.get(uid);
+ st += "楼" + MoneyBigDecimalUtil.div(
+ MoneyBigDecimalUtil.mul(moneyBigDecial, teamRewardMap.get(uid).getRate()), new BigDecimal(100));
st += "+";
if (teamReward2Map.get(uid) == null)
st += "楼0";
else
- st += "楼" + teamReward2Map.get(uid);
-
+ 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