From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
index ba856c2..32cdf15 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -474,12 +474,13 @@
int winNum = userTaoLiJinRecordVO.getWinNum();
int totalNum = userTaoLiJinRecordVO.getTotalNum();
userTaoLiJinRecordVO.setSurplusNum(totalNum - winNum);
+ SystemEnum system = userInfoService.getUserSystem(uid);
// 璁＄畻鍒嗕韩濂栭噾
BigDecimal shareMoney = new BigDecimal(0);
BigDecimal commission = userTaoLiJinRecordVO.getCommission();
if (commission != null && commission.compareTo(shareMoney) > 0) {
- BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen);
+ BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,system);
shareMoney = MoneyBigDecimalUtil.mul(commission,
MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
shareMoney = BigDecimalUtil.getWithNoZera(shareMoney);
@@ -576,7 +577,7 @@
while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.getValue(ConfigKeyEnum.appDownLink.getKey(),system)).replace("{闈㈤}",
+ tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.getValue(ConfigKeyEnum.appDownLink.getKey(), system)).replace("{闈㈤}",
amount.setScale(0).toString());
executor.execute(new Runnable() {
--
Gitblit v1.8.0