fix
Helius
2022-06-11 7e96543ae18f8625abefcddc875ef8010d35b28a
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -129,7 +129,7 @@
            // =======直推返利== start =====
            // 直接奖励收益
            BigDecimal dynamicProfit = amount.divide(new BigDecimal(dic.getValue()), 2, RoundingMode.HALF_UP);
            BigDecimal dynamicProfit = amount.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
            if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
                continue;
@@ -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);