From 9c44508bad37fa7e3409f271ddc9f3ea1e97209c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 31 Aug 2022 16:47:19 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 f72adf3..c2c3c24 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
@@ -17,6 +17,7 @@
import cc.mrbird.febs.job.SystemTradeJob;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -62,6 +63,7 @@
private final DappMemberBoxRecordMapper dappMemberBoxRecordMapper;
private final DappWalletCoinDao dappWalletCoinDao;
private final DappSdeWithdrawFeeDao dappSdeWithdrawFeeDao;
+ private final DappPriceRecordDao dappPriceRecordDao;
@Override
@@ -80,6 +82,7 @@
// int count = nftCount == null ? 0 : nftCount.intValue();
result.put("cardCnt", 1000);
result.put("nftPrice", AppContants.NFT_ACTIVE_PRICE);
+ result.put("rewardPool", ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(ChainEnum.BSC_TFC_REWARD.getAddress()));
return result;
}
@@ -743,7 +746,7 @@
// 源池USDT数量
BigDecimal usdtBalance = ChainService.getInstance(ChainEnum.BSC_USDT_SOURCE.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
- return tfcBalance.divide(usdtBalance, tfcInstance.decimals(), RoundingMode.HALF_UP);
+ return usdtBalance.divide(tfcBalance, tfcInstance.decimals(), RoundingMode.HALF_UP);
} else {
return new BigDecimal("0.05");
}
@@ -891,9 +894,6 @@
return cardCntMap;
}
- @Autowired
- private DappPriceRecordDao dappPriceRecordDao;
-
@Override
public void tfcNewPrice() {
BigDecimal newPrice = newestPrice();
@@ -918,4 +918,14 @@
// 给影子生态发送价格
chainProducer.sendTfcNewPrice(newPrice.toPlainString());
}
+
+ @Override
+ public List<DappPriceRecordEntity> findPriceListIn24H() {
+ DateTime startTime = DateUtil.offset(new Date(), DateField.HOUR, -24);
+ List<DappPriceRecordEntity> list = dappPriceRecordDao.selectPriceListInStartTimeAndEndTime(startTime, new Date());
+ list.forEach(item -> {
+ item.setTime(DateUtil.format(item.getCreateTime(), "HH:mm"));
+ });
+ return list;
+ }
}
--
Gitblit v1.9.1