fix some problem

Helius

2022-06-08 21c4edde92e2c7bade302db52329422821f0a8d5

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java

@@ -10,6 +10,7 @@
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.utils.OnlineTransferUtil;
import cc.mrbird.febs.dapp.vo.RedisTransferPoolVo;
import cc.mrbird.febs.dapp.vo.SlipSettingVo;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
@@ -75,6 +76,27 @@
        DappMemberEntity member = LoginUserUtil.getAppUser();

        SystemDto system = new SystemDto();
        String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
        // 启动未启动
        if (!"start".equals(hasStart)) {
            system.setFeeRatio(BigDecimal.TEN);
            system.setUsdtRemain(BigDecimal.ZERO);
            system.setUsdtTotal(BigDecimal.ZERO);
            system.setSaleRemain(BigDecimal.ZERO);
            system.setSaleTotal(BigDecimal.ZERO);
            Object makePoolObj = redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
            BigDecimal balance;
            if (makePoolObj == null) {
                balance = ChainService.getInstance(ChainEnum.BSC_TFC_MAKE.name()).balanceOf(ChainEnum.BSC_TFC_MAKE.getAddress());
                redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, balance);
            } else {
                balance = (BigDecimal) makePoolObj;
            }
            system.setBuyRemain(balance);
            system.setBuyTotal(balance);

            return system;
        }

        RedisTransferPoolVo transferPool = (RedisTransferPoolVo) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
        BigDecimal poolRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
@@ -113,6 +135,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void tradeProfitDistribute(Long id) {
        DappFundFlowEntity fundflow = dappFundFlowDao.selectById(id);
        String batchNo = RandomUtil.randomString(16) + id.toString();

        BigDecimal fee = fundflow.getFee();
        DappMemberEntity member = dappMemberDao.selectById(fundflow.getMemberId());
@@ -133,9 +156,7 @@
        log.info("销毁数量:{}, 比例:{}", destroy, slipSetting.getDestroyPoint());

        // 销毁
//        instance.transfer(AppContants.DESTROY_ADDRESS, destroy);
        DappOnlineTransferEntity destroyRecord = new DappOnlineTransferEntity(AppContants.DESTROY_ADDRESS, destroy, fundflow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), "TFC", fundflow.getId().toString());
        dappOnlineTransferDao.insert(destroyRecord);
        OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, fundflow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);

        // 总分发金额
        BigDecimal distrbAmount = fee.subtract(destroy);
@@ -145,39 +166,38 @@
        BigDecimal nodeAmount = distrbAmount.subtract(techAmount);
        log.info("总分发金额:{}, 技术:{}, 节点:{}", distrbAmount, techAmount, nodeAmount);

        if (CollUtil.isNotEmpty(parents)) {
            int i = 1;
            for (DappMemberEntity parent : parents) {
                BigDecimal balance = instance.balanceOf(parent.getAddress());
                log.info("地址:{}, 余额:{}", parent.getAddress(), balance);

        BigDecimal preNode = slipSetting.getNodeProp().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
        log.info("每份:{}", preNode);
        int i = 1;
        for (DappMemberEntity parent : parents) {
            BigDecimal balance = instance.balanceOf(parent.getAddress());
            log.info("地址:{}, 余额:{}", parent.getAddress(), balance);
                // 若地址持币少了指定数量
                if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 0) {
                    continue;
                }

            // 若地址持币少了指定数量 或者 不为创始节点，则不参与节点滑点
            if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 0 || parent.getNodeType() == 2) {
                return;
                DataDictionaryCustom distribDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_DISTRIBUTE_PROP, String.valueOf(i));
                if (distribDic == null) {
                    break;
                }

                BigDecimal total = distrbAmount.multiply(new BigDecimal(distribDic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));

                OnlineTransferUtil.addTransfer(parent.getAddress(), total, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);

                nodeAmount = nodeAmount.subtract(total);
                i++;
            }

            DataDictionaryCustom distribDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_DISTRIBUTE_PROP, String.valueOf(i));
            BigDecimal total = new BigDecimal(distribDic.getValue()).multiply(preNode);

//            instance.transfer(parent.getAddress(), total);
            DappOnlineTransferEntity distribRecord = new DappOnlineTransferEntity(parent.getAddress(), total, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), "TFC", fundflow.getId().toString());
            dappOnlineTransferDao.insert(distribRecord);

            nodeAmount = nodeAmount.subtract(total);
        }

        // 若节点金额还有剩余，则进入技术金额
        techAmount = techAmount.add(nodeAmount);
//        instance.transfer(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount);

        DappOnlineTransferEntity techRecord = new DappOnlineTransferEntity(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount, fundflow.getType(), 2, ChainEnum.BSC_TFC_SOURCE.name(), "TFC", fundflow.getId().toString());
        dappOnlineTransferDao.insert(techRecord);
        OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount, fundflow.getType(), 2, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);

        Map<String, String> map = new HashMap<>();
        map.put("batchNo", fundflow.getId().toString());
        map.put("type", "flow");
        map.put("batchNo", batchNo);
        map.put("type", "batch");

        // 发送转账消息
        chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
@@ -221,8 +241,7 @@
                continue;
            }

            DappOnlineTransferEntity tfc = new DappOnlineTransferEntity(member.getAddress(), mine, 3, 1, "TFC", ChainEnum.BSC_TFC.name(), batchNo);
            dappOnlineTransferDao.insert(tfc);
            OnlineTransferUtil.addTransfer(member.getAddress(), mine, 3, 1, ChainEnum.BSC_TFC.name(), AppContants.SYMBOL_COIN, batchNo);
        }

        Map<String, String> map = new HashMap<>();
@@ -248,22 +267,27 @@
                continue;
            }

            // TODO 线上转账，已注释
//            String txHash = ChainService.getInstance(transfer.getFromType()).transfer(transfer.getAddress(), transfer.getAmount());
//            transfer.setTxHash(txHash);
            String txHash = ChainService.getInstance(transfer.getFromType()).transfer(transfer.getAddress(), transfer.getAmount());
            while (StrUtil.isEmpty(txHash)) {
                // 休眠2s
                try {
                    Thread.sleep(2000);
                } catch (InterruptedException e) {
                    e.printStackTrace();
                }
                txHash = ChainService.getInstance(transfer.getFromType()).transfer(transfer.getAddress(), transfer.getAmount());
            }

            transfer.setTxHash(txHash);
            transfer.setHasFinish(1);
            transfer.setUpdateTime(new Date());
            dappOnlineTransferDao.updateById(transfer);

            if ("flow".equals(jsonObject.getString("type"))) {
                DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(Long.parseLong(batchNo));

                fundFlow.setStatus(3);
//                fundFlow.setToHash(txHash);

                fundFlow.setToHash(txHash);
                dappFundFlowDao.updateById(fundFlow);
            }

        }
    }
}