From ada1169b0bcabc1eadb621d2215f157234e4031a Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sat, 11 Jun 2022 22:57:12 +0800 Subject: [PATCH] fix to test --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java index 5e64ebc..08b5435 100644 --- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java @@ -13,13 +13,18 @@ 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.job.SystemTradeJob; import cc.mrbird.febs.rabbit.producer.ChainProducer; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -108,13 +113,17 @@ ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC.name()); BigDecimal balance = instance.balanceOf(member.getAddress()); + Object o = redisUtils.get(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress()); BigDecimal coinTotal = balance.multiply(BigDecimal.valueOf(0.3)).setScale(instance.decimals(), RoundingMode.HALF_DOWN); BigDecimal remain; if (o == null) { + DateTime tomorrow = DateUtil.beginOfDay(DateUtil.tomorrow()); + long time = DateUtil.between(new Date(), tomorrow, DateUnit.SECOND, true); + remain = coinTotal; - redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), remain); + redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), remain, time); } else { remain = (BigDecimal) o; } @@ -188,6 +197,9 @@ OnlineTransferUtil.addTransfer(parent.getAddress(), total, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo); + DappFundFlowEntity distribFlow = new DappFundFlowEntity(parent.getId(), total, 4, 2, BigDecimal.ZERO); + dappFundFlowDao.insert(distribFlow); + nodeAmount = nodeAmount.subtract(total); i++; } @@ -207,7 +219,6 @@ @Override public void mining() { - log.info("挖矿"); ContractChainService contract = ChainService.getInstance(ChainEnum.BSC_TFC.name()); // 发行量 BigInteger totalSupply = contract.totalSupply(); @@ -333,4 +344,22 @@ map.put("type", "batch"); chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map)); } + + @Autowired + private SystemTradeJob systemTradeJob; + + @Override + public void startSystem() { + log.info("启动系统"); + + Thread thread = new Thread(new Runnable() { + @Override + public void run() { + systemTradeJob.transferPoolVol(); + systemTradeJob.sourcePoolUsdtOutLimit(); + } + }); + + thread.start(); + } } -- Gitblit v1.9.1