xiaoyong931011
2023-08-17 2a0d43503ff4a6faa1d587074f6ff86a87406aac
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -3066,7 +3066,9 @@
                    amountMagic,
                    localTotalAchieve,
                    AccountFlowEnum.AMOUNT_RECORD.getCode(),
                    null);
                    "今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+",实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
                            "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN)+",原因消费金额1%加速上" +
                            "限,增加消费金额可获得更多收益");
            dappAccountMoneyChangeDao.insert(record);
            //实时更新用户等级
@@ -3083,6 +3085,9 @@
        if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlowEntity.getStatus()){
            return;
        }
        dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
        dappFundFlowDao.updateById(dappFundFlowEntity);
        BigDecimal cnt = dappFundFlowEntity.getAmount();
        Long memberId = dappFundFlowEntity.getMemberId();
        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
@@ -3093,21 +3098,22 @@
                DataDictionaryEnum.PACKAGE_SCORE_PRICE.getType(),
                DataDictionaryEnum.PACKAGE_SCORE_PRICE.getCode()
        );
        BigDecimal packageScorePrice = new BigDecimal(ObjectUtil.isEmpty(packageScorePriceDic) ? "0" : packageScorePriceDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal packageScorePrice = new BigDecimal(ObjectUtil.isEmpty(packageScorePriceDic) ? "0" : packageScorePriceDic.getValue()).setScale(8, BigDecimal.ROUND_DOWN);
        //卖出资产乘以价格获取到预期获取的总额
        BigDecimal totalAmount = cnt.multiply(packageScorePrice).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal totalAmount = cnt.multiply(packageScorePrice).setScale(4, BigDecimal.ROUND_DOWN);
        //资产包卖出划入底池比例
        DataDictionaryCustom packageToPoorPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.PACKAGE_SALE_TO_POOR_PERCENT.getType(),
                DataDictionaryEnum.PACKAGE_SALE_TO_POOR_PERCENT.getCode()
        );
        BigDecimal packageToPoorPercent = new BigDecimal(ObjectUtil.isEmpty(packageToPoorPercentDic) ? "0.1" : packageToPoorPercentDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal packageToPoorPercent = new BigDecimal(ObjectUtil.isEmpty(packageToPoorPercentDic) ? "0.1" : packageToPoorPercentDic.getValue()).setScale(8, BigDecimal.ROUND_DOWN);
        //划入底池的金额
        BigDecimal poorAmount = totalAmount.multiply(packageToPoorPercent).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal poorAmount = totalAmount.multiply(packageToPoorPercent).setScale(4, BigDecimal.ROUND_DOWN);
        //实际获取的金额
        BigDecimal realAmount = totalAmount.subtract(poorAmount);
        //生成一条资金流水
        DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
                AccountFlowEnum.AMOUNT.getCode(),
                memberId,
                realAmount,
                FundFlowEnum.SALE_PACKAGE_AMOUNT.getCode(),
@@ -3116,6 +3122,7 @@
        dappFundFlowDao.insert(scoreFlow);
        dappWalletCoinDao.addTotalAndaddAvailableByMemberId(memberId,realAmount);
        DappFundFlowEntity feeFlow = new DappFundFlowEntity(
                AccountFlowEnum.AMOUNT.getCode(),
                memberId,
                poorAmount.negate(),
                FundFlowEnum.SALE_PACKAGE_AMOUNT_FEE.getCode(),
@@ -3128,7 +3135,7 @@
                DataDictionaryEnum.PACKAGE_TOTAL_SCORE.getType(),
                DataDictionaryEnum.PACKAGE_TOTAL_SCORE.getCode()
        );
        BigDecimal packageTotalScore = new BigDecimal(ObjectUtil.isEmpty(packageTotalScoreDic) ? "21000" : packageTotalScoreDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal packageTotalScore = new BigDecimal(ObjectUtil.isEmpty(packageTotalScoreDic) ? "21000" : packageTotalScoreDic.getValue()).setScale(4, BigDecimal.ROUND_DOWN);
        BigDecimal avaPackageTotalScore = packageTotalScore.subtract(cnt);
        packageTotalScoreDic.setValue(avaPackageTotalScore.toString());
        dataDictionaryCustomMapper.updateById(packageTotalScoreDic);
@@ -3137,7 +3144,7 @@
                DataDictionaryEnum.PACKAGE_POOR.getType(),
                DataDictionaryEnum.PACKAGE_POOR.getCode()
        );
        BigDecimal packagePoor = new BigDecimal(ObjectUtil.isEmpty(packagePoorDic) ? "0" : packagePoorDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal packagePoor = new BigDecimal(ObjectUtil.isEmpty(packagePoorDic) ? "0" : packagePoorDic.getValue()).setScale(4, BigDecimal.ROUND_DOWN);
        BigDecimal avaPackagePoor = packagePoor.add(poorAmount);
        packagePoorDic.setValue(avaPackagePoor.toString());
        dataDictionaryCustomMapper.updateById(packagePoorDic);
@@ -3150,7 +3157,7 @@
                DataDictionaryEnum.PACKAGE_AVA_CNT.getType(),
                DataDictionaryEnum.PACKAGE_AVA_CNT.getCode()
        );
        BigDecimal packageAvaCnt = new BigDecimal(ObjectUtil.isEmpty(packageAvaCntDic) ? "0" : packageAvaCntDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal packageAvaCnt = new BigDecimal(ObjectUtil.isEmpty(packageAvaCntDic) ? "0" : packageAvaCntDic.getValue()).setScale(4, BigDecimal.ROUND_DOWN);
        BigDecimal packageAvaCntScore = packageAvaCnt.add(cnt);
        packageAvaCntDic.setValue(packageAvaCntScore.toString());
        dataDictionaryCustomMapper.updateById(packageAvaCntDic);