From 0a8a1ed58585bbd2a55ea6b41732b13af03920ff Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 08 Sep 2022 20:02:45 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 187 ++++++++++++++++++++++++++++++++--------------
1 files changed, 128 insertions(+), 59 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 0a44401..d77d0c1 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
@@ -10,17 +10,22 @@
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.chain.ContractChainService;
-import cc.mrbird.febs.dapp.dto.PriceDto;
-import cc.mrbird.febs.dapp.dto.RecordInPageDto;
-import cc.mrbird.febs.dapp.dto.TransferDto;
-import cc.mrbird.febs.dapp.dto.WalletOperateDto;
+import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.BoxUtil;
+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;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
@@ -30,9 +35,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author
@@ -51,6 +54,7 @@
private final RedisUtils redisUtils;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final DappSystemService dappSystemService;
+ private final DappNftActivationDao dappNftActivationDao;
@Override
public WalletInfoVo walletInfo() {
@@ -232,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()) {
@@ -239,21 +246,21 @@
throw new FebsException(MessageSourceUtils.getString("transfer_msg_001"));
}
- if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) {
- throw new FebsException(MessageSourceUtils.getString("transfer_msg_002"));
- }
-
- if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) {
- throw new FebsException(MessageSourceUtils.getString("transfer_msg_003"));
- }
-
- usdtRemain = usdtRemain.subtract(transferDto.getAmount().multiply(transferDto.getPrice()));
- saleCoinRemain = saleCoinRemain.subtract(transferDto.getAmount());
-
- // 修改当日U剩余量
- redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
- // 修改用户24小时可售量
- redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
+// if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) {
+// throw new FebsException(MessageSourceUtils.getString("transfer_msg_002"));
+// }
+//
+// if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) {
+// throw new FebsException(MessageSourceUtils.getString("transfer_msg_003"));
+// }
+//
+// usdtRemain = usdtRemain.subtract(transferDto.getAmount().multiply(transferDto.getPrice()));
+// saleCoinRemain = saleCoinRemain.subtract(transferDto.getAmount());
+//
+// // 修改当日U剩余量
+// redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
+// // 修改用户24小时可售量
+// redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain, time);
} else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
// 购买时，前端传来的amount是USDT，卖出amount是TFC
BigDecimal usdtAmount = transferDto.getAmount();
@@ -286,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);
@@ -325,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()));
@@ -334,7 +342,7 @@
// 修改当日U剩余量
redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
// 修改用户24小时可售量
- redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
+ redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain, time);
}
dappFundFlowDao.deleteById(transferDto.getId());
}
@@ -363,7 +371,7 @@
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);
@@ -371,40 +379,101 @@
}
@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 synchronized void activeNft(ActiveDto activeDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+
+ 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"));
+ }
+
+ 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);
+ }
+
+ @Override
+ public List<ActiveNftListVo> findUnActiveNftList() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ List<ActiveNftListVo> list = new ArrayList<>();
+
+ 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)) {
+ return list;
+ }
+
+ Date now = new Date();
+ nftActivations.forEach(nft -> {
+ ActiveNftListVo nftVo = new ActiveNftListVo();
+ nftVo.setId(nft.getId());
+ nftVo.setRemain(DateUtil.between(now, nft.getExpireTime(), DateUnit.SECOND, false));
+ nftVo.setCount(nft.getCount());
+ list.add(nftVo);
+ });
+
+ return list;
}
}
--
Gitblit v1.9.1