From 1a7d5952a941639367db363deacf0477e0894262 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 11 Aug 2022 18:55:38 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 12 +++++++-----
1 files changed, 7 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 d1b6b1e..eb78c03 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
@@ -370,7 +370,6 @@
HashMap<String, BigDecimal> map = new HashMap<>();
map.put("x", x);
map.put("y", y);
- map.put("nft", AppContants.NFT_ACTIVE_PRICE);
return map;
}
@@ -412,11 +411,9 @@
nftActivation.setCount(box.getIndex());
nftActivation.setOpenTime(time);
nftActivation.setExpireTime(expire);
-
dappNftActivationDao.insert(nftActivation);
ActiveNftListVo nft = new ActiveNftListVo();
- nft.setStatus(3);
nft.setCount(box.getIndex());
nft.setId(nftActivation.getId());
nft.setRemain(DateUtil.between(time, expire, DateUnit.SECOND));
@@ -443,10 +440,15 @@
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(activeDto.getCount()), 8, 1, BigDecimal.ZERO, activeDto.getTxHash());
- fundFlow.setNewestPrice(AppContants.NFT_ACTIVE_PRICE);
+ fundFlow.setNewestPrice(AppContants.NFT_ACTIVE_PRICE.multiply(BigDecimal.valueOf(nftActive.getCount())));
dappFundFlowDao.insert(fundFlow);
- nftActive.setCount(nftActive.getCount() - activeDto.getCount());
+ int count = nftActive.getCount() - activeDto.getCount();
+ if (count == 0) {
+ nftActive.setStatus(3);
+ }
+
+ nftActive.setCount(count);
dappNftActivationDao.updateById(nftActive);
}
--
Gitblit v1.9.1