fix

Helius

2022-07-28 e153ad745d6bec9f6053ec08aa4e2f1d21cb8320

fix

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

@@ -41,7 +41,7 @@
import java.util.*;

/**
 * @author 
 * @author
 * @date 2022-03-24
 **/
@Slf4j
@@ -176,7 +176,8 @@
            parents = new ArrayList<>();
        } else {
            List<String> inviteIds = StrUtil.split(member.getRefererId(), ',');
            parents = dappMemberDao.selectParentsList(inviteIds, 6);;
            parents = dappMemberDao.selectParentsList(inviteIds, 6);
            ;
        }

        DataDictionaryCustom miniHoldCoin = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
@@ -270,12 +271,48 @@
    @Override
    public void tradeNftProfitDistribute(Long id) {
        DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(id);
        String batchNo = RandomUtil.randomString(16) + id.toString();

        BigInteger totalNFT = ChainService.getInstance(ChainEnum.BSC_TFC.name()).totalSupply();
        ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
        BigDecimal preNFTAmount;
        BigDecimal distribAmount = fundFlow.getFee();
        if (fundFlow.getType() == 1) {
            preNFTAmount = distribAmount.divide(new BigDecimal("5000"), 2, RoundingMode.HALF_UP);

        } else if (fundFlow.getType() == 2) {
            BigDecimal destroyAmount = fundFlow.getFee().multiply(new BigDecimal("2").divide(new BigDecimal("7"), instance.decimals(), RoundingMode.HALF_UP));
            // 销毁
            OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
            distribAmount = fundFlow.getFee().subtract(destroyAmount);

            preNFTAmount = distribAmount.divide(new BigDecimal("5000"), 2, RoundingMode.HALF_UP);

        } else {
            return;
        }

        List<DappMemberEntity> allMembers = dappMemberDao.selectList(null);
        if (CollUtil.isEmpty(allMembers)) {
            return;
        }

        BigDecimal total = BigDecimal.ZERO;
        for (DappMemberEntity member : allMembers) {
            BigDecimal balance = instance.balanceOf(member.getAddress());
            BigDecimal memberProfit = balance.multiply(preNFTAmount);

            // 返利
            OnlineTransferUtil.addTransfer(member.getAddress(), memberProfit, fundFlow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);

            DappFundFlowEntity distribFlow = new DappFundFlowEntity(member.getId(), memberProfit, 4, 2, BigDecimal.ZERO);
            dappFundFlowDao.insert(distribFlow);

            total = total.add(memberProfit);
        }

        BigDecimal remain = distribAmount.subtract(total);
        // 剩余的
        OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_TECH.getAddress(), remain, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
    }

//    public static void main(String[] args) throws IOException {
@@ -487,7 +524,7 @@

        Object o = redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
        if (o == null) {
            RedisTransferPoolVo transferPool= new RedisTransferPoolVo();
            RedisTransferPoolVo transferPool = new RedisTransferPoolVo();
            BigDecimal total = basicVol.multiply(volProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
            transferPool.setTodayVol(total);
            transferPool.setTodayProp(volProp);

 src/test/java/cc/mrbird/febs/ChainTest.java

@@ -8,7 +8,7 @@
import cc.mrbird.febs.dapp.mapper.DappFundFlowDao;
import cc.mrbird.febs.dapp.mapper.DappOnlineTransferDao;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.job.SystemTradeJob;
//import cc.mrbird.febs.job.SystemTradeJob;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import com.alibaba.fastjson.JSONObject;
import org.junit.jupiter.api.Test;
@@ -36,24 +36,24 @@
        System.out.println(instance.balanceOf("0x0000000000000000000000000000000000000001"));
    }

    @Autowired
    private SystemTradeJob systemTradeJob;

    @Test
    public void transferPoolTest() {
        systemTradeJob.transferPoolVol();
    }


    @Test
    public void sourceUsdtTest() {
        systemTradeJob.sourcePoolUsdtOutLimit();
    }

    @Test
    public void poolTest() {
        systemTradeJob.transferPoolVol();
    }
//    @Autowired
//    private SystemTradeJob systemTradeJob;
//
//    @Test
//    public void transferPoolTest() {
//        systemTradeJob.transferPoolVol();
//    }
//
//
//    @Test
//    public void sourceUsdtTest() {
//        systemTradeJob.sourcePoolUsdtOutLimit();
//    }
//
//    @Test
//    public void poolTest() {
//        systemTradeJob.transferPoolVol();
//    }

    @Autowired
    private DappOnlineTransferDao dappOnlineTransferDao;
@@ -79,10 +79,10 @@
        System.out.println(ChainService.getInstance(ChainEnum.BSC_TFC.name()).blockNumber());
    }

    @Test
    public void mineTest() {
        systemTradeJob.mineJob();
    }
//    @Test
//    public void mineTest() {
//        systemTradeJob.mineJob();
//    }

    @Autowired
    private DappFundFlowDao dappFundFlowDao;
@@ -114,4 +114,9 @@
    public void profitTest() {
        dappSystemService.tradeProfitDistribute(31L);
    }
}

    @Test
    public void nftBalanceTest() {
        BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).balanceOf("0x971c09aa9735eb98459b17ec8b48932d24cbb931");
        System.out.println(1);
    }}