From 7973e0034d8a7c1bc3465d36829fc4440b6ce84f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 11:11:49 +0800
Subject: [PATCH] fix card
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 1b91fbd..097536b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -428,20 +428,28 @@
DappNftActivation nftActive = dappNftActivationDao.selectById(activeDto.getId());
if (nftActive == null) {
- throw new FebsException("NFT不存在");
+ throw new FebsException(MessageSourceUtils.getString("nft_active_003"));
}
if (nftActive.getCount() < activeDto.getCount()) {
- throw new FebsException("NFT不足或者正在激活中");
+ throw new FebsException(MessageSourceUtils.getString("nft_active_004"));
+ }
+
+ if (DateUtil.between(new Date(), nftActive.getExpireTime(), DateUnit.SECOND) < 0) {
+ throw new FebsException(MessageSourceUtils.getString("nft_active_005"));
}
if (nftActive.getStatus() != 1) {
throw new FebsException(MessageSourceUtils.getString("nft_active_001"));
}
-
+ PriceDto priceDto = new PriceDto();
+ priceDto.setAmount(BigDecimal.ZERO);
+ Map<String, BigDecimal> price = calPrice(priceDto);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(activeDto.getCount()), 8, 1, BigDecimal.ZERO, activeDto.getTxHash());
- fundFlow.setNewestPrice(AppContants.NFT_ACTIVE_PRICE.multiply(BigDecimal.valueOf(nftActive.getCount())));
+
+ fundFlow.setTargetAmount(AppContants.NFT_ACTIVE_PRICE.multiply(BigDecimal.valueOf(nftActive.getCount())).multiply(price.get("x")));
+ fundFlow.setNewestPrice(price.get("x"));
dappFundFlowDao.insert(fundFlow);
int count = nftActive.getCount() - activeDto.getCount();
@@ -462,7 +470,7 @@
UpdateWrapper<DappNftActivation> query = new UpdateWrapper<>();
query.eq("status", 1);
query.eq("member_id", member.getId());
- query.lt("expire_time", new Date());
+ query.ge("expire_time", new Date());
List<DappNftActivation> nftActivations = dappNftActivationDao.selectList(query);
if (CollUtil.isEmpty(nftActivations)) {
--
Gitblit v1.9.1