From 914b789d830d887ebdce2e87e9d29c409f3618a9 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 12 Aug 2022 14:30:52 +0800 Subject: [PATCH] ifx --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 77 +++++++++++++++++++++++++------------- 1 files changed, 51 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 be99e2a..40ad5d9 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 @@ -19,6 +19,7 @@ import cc.mrbird.febs.dapp.vo.ActiveNftListVo; import cc.mrbird.febs.dapp.vo.WalletInfoVo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -369,28 +370,23 @@ HashMap<String, BigDecimal> map = new HashMap<>(); map.put("x", x); map.put("y", y); - map.put("nft", AppContants.NFT_ACTIVE_PRICE); return map; } @Override - public int boxSurprise() { + public ActiveNftListVo boxSurprise() { + DappMemberEntity member = LoginUserUtil.getAppUser(); - // 功能升级 - throw new FebsException(MessageSourceUtils.getString("box_surprise_002")); + DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId()); + if (walletCoin.getBoxCnt() < 1) { + throw new FebsException(MessageSourceUtils.getString("box_surprise_001")); + } -// DappMemberEntity member = LoginUserUtil.getAppUser(); -// -// DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId()); -// if (walletCoin.getBoxCnt() < 1) { -// throw new FebsException(MessageSourceUtils.getString("box_surprise_001")); -// } -// -// walletCoin.setBoxCnt(walletCoin.getBoxCnt() - 1); -// dappWalletCoinDao.updateById(walletCoin); -// -// BoxUtil.Box box = BoxUtil.openBox(); -// + walletCoin.setBoxCnt(walletCoin.getBoxCnt() - 1); + dappWalletCoinDao.updateById(walletCoin); + + BoxUtil.Box box = BoxUtil.openBox(); + // DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(box.getIndex()), 6, 2, BigDecimal.ZERO); // dappFundFlowDao.insert(boxFundFlow); // @@ -407,25 +403,53 @@ // log.error("发放卡牌错误", e); // } // }).start(); -// -// return box.getIndex(); + + Date time = new Date(); + Date expire = DateUtil.offset(time, DateField.HOUR, 2); + DappNftActivation nftActivation = new DappNftActivation(); + nftActivation.setMemberId(member.getId()); + nftActivation.setCount(box.getIndex()); + nftActivation.setOpenTime(time); + nftActivation.setExpireTime(expire); + nftActivation.setStatus(1); + dappNftActivationDao.insert(nftActivation); + + ActiveNftListVo nft = new ActiveNftListVo(); + nft.setCount(box.getIndex()); + nft.setId(nftActivation.getId()); + nft.setRemain(DateUtil.between(time, expire, DateUnit.SECOND)); + return nft; } @Override @Transactional(rollbackFor = Exception.class) - public void activeNft(ActiveDto activeDto) { + public synchronized void activeNft(ActiveDto activeDto) { DappMemberEntity member = LoginUserUtil.getAppUser(); - DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), BigDecimal.ONE, 8, 1, BigDecimal.ZERO, activeDto.getTxHash()); - fundFlow.setNewestPrice(AppContants.NFT_ACTIVE_PRICE); - - dappFundFlowDao.insert(fundFlow); DappNftActivation nftActive = dappNftActivationDao.selectById(activeDto.getId()); + if (nftActive == null) { + throw new FebsException("NFT不存在"); + } + + if (nftActive.getCount() < activeDto.getCount()) { + throw new FebsException("NFT不足或者正在激活中"); + } + if (nftActive.getStatus() != 1) { throw new FebsException(MessageSourceUtils.getString("nft_active_001")); } - nftActive.setStatus(2); + + 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()))); + dappFundFlowDao.insert(fundFlow); + + int count = nftActive.getCount() - activeDto.getCount(); + if (count == 0) { + nftActive.setStatus(3); + } + + nftActive.setCount(count); dappNftActivationDao.updateById(nftActive); } @@ -435,7 +459,7 @@ List<ActiveNftListVo> list = new ArrayList<>(); UpdateWrapper<DappNftActivation> query = new UpdateWrapper<>(); - query.eq("status", 3); + query.eq("status", 1); query.eq("member_id", member.getId()); List<DappNftActivation> nftActivations = dappNftActivationDao.selectList(query); @@ -447,7 +471,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)); + list.add(nftVo); }); -- Gitblit v1.9.1