fix

Helius

2022-08-30 32f0cd79eef4765c0d8a0594d4611df82fdcbc25

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

@@ -61,6 +61,7 @@
    private final DappSymbolDailyPriceMapper dappSymbolDailyPriceMapper;
    private final DappMemberBoxRecordMapper dappMemberBoxRecordMapper;
    private final DappWalletCoinDao dappWalletCoinDao;
    private final DappSdeWithdrawFeeDao dappSdeWithdrawFeeDao;


    @Override
@@ -320,7 +321,7 @@
            OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);

            BigDecimal remain = fundFlow.getFee().subtract(destroyAmount);
            BigDecimal preNftAmount = remain.divide(new BigDecimal(5000),2 ,RoundingMode.HALF_UP);
            BigDecimal preNftAmount = remain.divide(new BigDecimal(5000), 2, RoundingMode.HALF_UP);

            BigDecimal total = BigDecimal.ZERO;
            for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
@@ -332,7 +333,8 @@
                OnlineTransferUtil.addTransfer(entry.getKey(), profit, 4, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);

                total = total.add(profit);
            };
            }
            ;

            if (remain.subtract(total).compareTo(BigDecimal.ZERO) > 0) {
                OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_FEE.getAddress(), remain.subtract(total), 4, 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
@@ -544,7 +546,7 @@
    }

    // 最低容量(百分比)
    private final BigDecimal volProp = new BigDecimal("2");
    private final BigDecimal volProp = new BigDecimal("5");
    // 每日增/减百分比
    private final BigDecimal changeProp = new BigDecimal("1");

@@ -721,7 +723,6 @@
    public boolean systemHasStart() {
        String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
        if (!"start".equals(hasStart)) {
            log.info("系统未启动");
            return false;
        }

@@ -758,33 +759,103 @@
     * @param data
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void sdmWithdrawFee(String data) {
        BigDecimal totalFee = new BigDecimal(data);
        String batchNo = RandomUtil.randomString(16);
        JSONObject jsonObject = JSONObject.parseObject(data);

        BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.5"));
        String address = jsonObject.getString("address");
        if (!ChainEnum.BSC_TFC_FEE.getAddress().equals(address)) {
            return;
        }

        String flowId = jsonObject.getString("flow");
        BigDecimal totalFee = new BigDecimal(jsonObject.getString("fee"));

        BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.4"));
        BigDecimal destroy = totalFee.subtract(cardProfit);

        BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), 2, RoundingMode.HALF_UP);

        BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals(), RoundingMode.HALF_UP);
        Map<String, Integer> cardCntMap = nfcCardMap();
        if (!cardCntMap.isEmpty()) {
            for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
                BigDecimal amount = preFee.multiply(new BigDecimal(entry.getValue()));

                DappMemberEntity member = dappMemberDao.selectByAddress(entry.getKey(), "BSC");
                DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 1, null, null);
                dappFundFlowDao.insert(fundFlow);
                if (member == null) {
                    continue;
                }

                OnlineTransferUtil.addTransfer(entry.getKey(), amount, 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);

                Map<String, Object> map = new HashMap<>();
                map.put("batchNo", batchNo);
                chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
                DappSdeWithdrawFeeEntity sdeWithdrawFee = new DappSdeWithdrawFeeEntity(member.getId(), member.getAddress(), amount, Long.parseLong(flowId));
                dappSdeWithdrawFeeDao.insert(sdeWithdrawFee);
            }
        }

        OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, 5, 2, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
        DappSdeWithdrawFeeEntity destroyFee = new DappSdeWithdrawFeeEntity(null, AppContants.DESTROY_ADDRESS, destroy, Long.parseLong(flowId));
        dappSdeWithdrawFeeDao.insert(destroyFee);
    }
//    @Override
//    public void sdmWithdrawFee(String data) {
//        JSONObject jsonObject = JSONObject.parseObject(data);
//
//        String address = jsonObject.getString("address");
//        if (!ChainEnum.BSC_TFC_FEE.getAddress().equals(address)) {
//            return;
//        }
//
//        BigDecimal totalFee = new BigDecimal(jsonObject.getString("fee"));
//        String batchNo = RandomUtil.randomString(16);
//
//        BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.4"));
//        BigDecimal destroy = totalFee.subtract(cardProfit);
//
//        BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals(), RoundingMode.HALF_UP);
//
//        Map<String, Integer> cardCntMap = nfcCardMap();
//        if (!cardCntMap.isEmpty()) {
//            for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
//                BigDecimal amount = preFee.multiply(new BigDecimal(entry.getValue()));
//
//                DappMemberEntity member = dappMemberDao.selectByAddress(entry.getKey(), "BSC");
//                if (member == null) {
//                    continue;
//                }
//                DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 2, null, null);
//                dappFundFlowDao.insert(fundFlow);
//
//                OnlineTransferUtil.addTransfer(entry.getKey(), amount, 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
//            }
//        }
//
//        OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, 5, 2, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
//
//        Map<String, Object> map = new HashMap<>();
//        map.put("batchNo", batchNo);
//        chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
//    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void sdmWithdrawFeeDistrib() {
        List<DappSdeWithdrawFeeEntity> list = dappSdeWithdrawFeeDao.selectShouldReturnList();
        if (CollUtil.isEmpty(list)) {
            return;
        }

        String batchNo = RandomUtil.randomString(16);
        list.forEach(item -> {
            if (!AppContants.DESTROY_ADDRESS.equals(item.getAddress())) {
                DappMemberEntity member = dappMemberDao.selectByAddress(item.getAddress(), "BSC");
                if (member == null) {
                    return;
                }

                DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), item.getAmount(), 4, 2, null, null);
                dappFundFlowDao.insert(fundFlow);
            }

            OnlineTransferUtil.addTransfer(item.getAddress(), item.getAmount(), 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
        });
        dappSdeWithdrawFeeDao.updateHasReturnToFinish();

        Map<String, Object> map = new HashMap<>();
        map.put("batchNo", batchNo);
@@ -793,7 +864,7 @@

    private Map<String, Integer> nfcCardMap() {
        ContractChainService nftInstance = ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name());
        BigInteger totalNFT = nftInstance.totalSupply();
        BigInteger totalNFT = nftInstance.totalSupplyNFT();

        Map<String, Integer> cardCntMap = new HashMap<>();
        for (int i = 0; i < totalNFT.intValue(); i++) {