From 5ac4151ea1021cae4e09fff8913e45172076a541 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 12 Aug 2022 15:33:57 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 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..0af8d99 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,10 @@ nftActivation.setCount(box.getIndex()); nftActivation.setOpenTime(time); nftActivation.setExpireTime(expire); - + nftActivation.setStatus(1); 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 +441,16 @@ 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); + nftActive.setHash(activeDto.getTxHash()); dappNftActivationDao.updateById(nftActive); } @@ -468,8 +472,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