From 895dc6191e123c372ce5ea8e92246081e208f4b6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 11 Jun 2022 20:49:44 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 80e5a8b..e1c333f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -168,16 +168,15 @@
List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.INDIRECT_BONUS_SETTING.getType());
directCnt = directCnt == null ? 0 :directCnt;
- // 隔代字典
- DataDictionaryCustom indrectDic = new DataDictionaryCustom();
- for (DataDictionaryCustom dataDic : dataDices) {
- if (directCnt > Integer.parseInt(dataDic.getValue())) {
- indrectDic = dataDic;
- }
- }
// 隔代比例
- BigDecimal indrectDicProp = new BigDecimal(indrectDic.getValue());
+ BigDecimal indrectDicProp = BigDecimal.ZERO;
+ for (DataDictionaryCustom dataDic : dataDices) {
+ JSONObject jsonObject = JSONObject.parseObject(dataDic.getValue());
+ if (directCnt >= jsonObject.getInteger("pushCnt")) {
+ indrectDicProp = jsonObject.getBigDecimal("prop");
+ }
+ }
// 隔代推荐奖 收益
direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
--
Gitblit v1.9.1