From 5fee2d8109856b96b6589b736df9e72ea78b99d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 12:41:38 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 49 +++++++++++++++++++++++--------------------------
1 files changed, 23 insertions(+), 26 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 83d9dc1..04e8669 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;
}
@@ -388,23 +387,6 @@
BoxUtil.Box box = BoxUtil.openBox();
-// DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(box.getIndex()), 6, 2, BigDecimal.ZERO);
-// dappFundFlowDao.insert(boxFundFlow);
-//
-// new Thread(() -> {
-// try {
-// int count = box.getIndex();
-// while (count > 0) {
-// ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
-// Thread.sleep(5000);
-// count--;
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// log.error("发放卡牌错误", e);
-// }
-// }).start();
-
Date time = new Date();
Date expire = DateUtil.offset(time, DateField.HOUR, 2);
DappNftActivation nftActivation = new DappNftActivation();
@@ -412,7 +394,7 @@
nftActivation.setCount(box.getIndex());
nftActivation.setOpenTime(time);
nftActivation.setExpireTime(expire);
-
+ nftActivation.setStatus(1);
dappNftActivationDao.insert(nftActivation);
ActiveNftListVo nft = new ActiveNftListVo();
@@ -429,23 +411,37 @@
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);
+
+ fundFlow.setTargetAmount(AppContants.NFT_ACTIVE_PRICE.multiply(BigDecimal.valueOf(nftActive.getCount())).multiply(price.get("x")));
+ fundFlow.setNewestPrice(price.get("x"));
dappFundFlowDao.insert(fundFlow);
- nftActive.setCount(nftActive.getCount() - activeDto.getCount());
+ int count = nftActive.getCount() - activeDto.getCount();
+ if (count == 0) {
+ nftActive.setStatus(3);
+ }
+
+ nftActive.setCount(count);
+ nftActive.setHash(activeDto.getTxHash());
dappNftActivationDao.updateById(nftActive);
}
@@ -457,6 +453,7 @@
UpdateWrapper<DappNftActivation> query = new UpdateWrapper<>();
query.eq("status", 1);
query.eq("member_id", member.getId());
+ query.ge("expire_time", new Date());
List<DappNftActivation> nftActivations = dappNftActivationDao.selectList(query);
if (CollUtil.isEmpty(nftActivations)) {
@@ -467,8 +464,8 @@
nftActivations.forEach(nft -> {
ActiveNftListVo nftVo = new ActiveNftListVo();
nftVo.setId(nft.getId());
- nftVo.setRemain(DateUtil.between(nft.getOpenTime(), now, DateUnit.SECOND, false));
-
+ nftVo.setRemain(DateUtil.between(now, nft.getExpireTime(), DateUnit.SECOND, false));
+ nftVo.setCount(nft.getCount());
list.add(nftVo);
});
--
Gitblit v1.9.1