From 705e475757bd22e64b03432fb7a9b3c38de84cd3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 09 Sep 2022 11:35:06 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 f2427b0..e1c26bb 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
@@ -145,12 +147,9 @@
Object o = redisUtils.get(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress());
- BigDecimal minLimit = new BigDecimal(50);
- BigDecimal coinTotal;
- if (balance.compareTo(minLimit) > 0) {
+ BigDecimal coinTotal = balance;
+ if (this.hasProfit(member.getAddress())) {
coinTotal = balance.multiply(BigDecimal.valueOf(0.3)).setScale(instance.decimals(), RoundingMode.HALF_DOWN);
- } else {
- coinTotal = new BigDecimal(50);
}
BigDecimal remain;
@@ -892,9 +891,6 @@
return cardCntMap;
}
- @Autowired
- private DappPriceRecordDao dappPriceRecordDao;
-
@Override
public void tfcNewPrice() {
BigDecimal newPrice = newestPrice();
@@ -919,4 +915,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