From 1d58176016c8a7672ba706d55fd45bd2c7c079dd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 02 Sep 2022 09:13:50 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 68 insertions(+), 45 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..87dd4e8 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,8 @@
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.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -234,6 +236,9 @@
// 铸池中的币的剩余量
BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
+ DateTime tomorrow = DateUtil.beginOfDay(DateUtil.tomorrow());
+ long time = DateUtil.between(new Date(), tomorrow, DateUnit.SECOND, true);
+
String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
if (transferDto.getId() == null) {
if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
@@ -288,8 +293,9 @@
makeCoinRemain = makeCoinRemain.subtract(transferDto.getAmount());
buyUsdtMax = buyUsdtMax.subtract(usdtAmount);
+
// 修改每日最大购买USDT量
- redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax, time);
// 修改铸池量
redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
@@ -327,7 +333,7 @@
// 修改铸池量
redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
- redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax, time);
}
} else {
usdtRemain = usdtRemain.add(transferDto.getAmount().multiply(transferDto.getPrice()));
@@ -365,67 +371,82 @@
BigDecimal x = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_UP);
BigDecimal y = sourceU.divide(sourceCoin.add(coin), tfcInstance.decimals(), RoundingMode.HALF_UP);
- log.info("购买价格:{}, 出卖价格:{}", x, y);
+// log.info("购买价格:{}, 出卖价格:{}", x, y);
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();
-//
-// 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();
-//
-// return box.getIndex();
+ walletCoin.setBoxCnt(walletCoin.getBoxCnt() - 1);
+ dappWalletCoinDao.updateById(walletCoin);
+
+ BoxUtil.Box box = BoxUtil.openBox();
+
+ Date time = new Date();
+ Date expire = DateUtil.offset(time, DateField.HOUR, 48);
+ 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(MessageSourceUtils.getString("nft_active_003"));
+ }
+
+ if (nftActive.getCount() < activeDto.getCount()) {
+ 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"));
}
- nftActive.setStatus(2);
+ 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.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();
+ if (count == 0) {
+ nftActive.setStatus(3);
+ }
+
+ nftActive.setCount(count);
+ nftActive.setHash(activeDto.getTxHash());
dappNftActivationDao.updateById(nftActive);
}
@@ -435,8 +456,9 @@
List<ActiveNftListVo> list = new ArrayList<>();
UpdateWrapper<DappNftActivation> query = new UpdateWrapper<>();
- query.eq("status", 3);
+ 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)) {
@@ -447,7 +469,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