From 3df9ce1cd79e43fbc1036e8ee8414de711e97eb0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Aug 2022 09:56:12 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 223 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 144 insertions(+), 79 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 829727f..d3799dc 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.service.impl;
+import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
@@ -9,15 +10,21 @@
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.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;
@@ -27,9 +34,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
@@ -46,6 +51,9 @@
private final DappFundFlowDao dappFundFlowDao;
private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
private final RedisUtils redisUtils;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final DappSystemService dappSystemService;
+ private final DappNftActivationDao dappNftActivationDao;
@Override
public WalletInfoVo walletInfo() {
@@ -57,12 +65,15 @@
List<DappMemberEntity> notDirect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2);
BigDecimal childHoldAmount = dappMemberDao.selectChildHoldAmount(member.getInviteId());
+ DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
+
walletInfo.setTotalChild(notDirect.size());
walletInfo.setDirectCnt(direct.size());
walletInfo.setTotalChildCoin(childHoldAmount);
walletInfo.setTeamReward(map.get("teamReward"));
walletInfo.setMiningAmount(map.get("mine"));
walletInfo.setInviteId(member.getInviteId());
+ walletInfo.setBoxCnt(walletCoin.getBoxCnt());
return walletInfo;
}
@@ -143,6 +154,8 @@
dappFundFlowEntity.setType(recordInPageDto.getType());
}
dappFundFlowEntity.setMemberId(member.getId());
+ dappFundFlowEntity.setStatus(2);
+
IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
return records.getRecords();
}
@@ -206,83 +219,21 @@
public Long transfer(TransferDto transferDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
- if (member.getActiveStatus() == 2) {
- throw new FebsException("请联系邀请人转币激活");
- }
-
- // 每日出U剩余量(卖币)
- BigDecimal usdtRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN);
- // 用户24小时可出售量
- BigDecimal saleCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress());
- BigDecimal buyCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
- // 铸池中的币的剩余量
- BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
-
- String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
if (transferDto.getId() == null) {
- if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
- if (!"start".equals(hasStart)) {
- throw new FebsException("系统还未启动");
- }
-
- if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) {
- throw new FebsException("超过当日出U剩余量");
- }
-
- if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) {
- throw new FebsException("超出24小时内可售量");
- }
-
- } else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
- if ("start".equals(hasStart)) {
- if (transferDto.getAmount().compareTo(buyCoinRemain) > 0) {
- throw new FebsException("超过当日可购买量");
- }
- // 如果系统还没有启动，则判断铸池中的剩余量
- } else {
- if (transferDto.getAmount().compareTo(makeCoinRemain) > 0) {
- throw new FebsException("可购数量不足");
- }
- }
- }
-
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash());
- fundFlow.setNewestPrice(transferDto.getPrice());
dappFundFlowDao.insert(fundFlow);
return fundFlow.getId();
}
if ("success".equals(transferDto.getFlag())) {
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
-
flow.setFromHash(transferDto.getTxHash());
dappFundFlowDao.updateById(flow);
-
- if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
- usdtRemain = usdtRemain.subtract(flow.getAmount().multiply(flow.getNewestPrice()));
- saleCoinRemain = saleCoinRemain.subtract(flow.getAmount());
-
- // 修改当日U剩余量
- redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
- // 修改用户24小时可售量
- redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
- } else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
- if ("start".equals(hasStart)) {
- buyCoinRemain = buyCoinRemain.subtract(flow.getAmount());
-
- // 修改当日可购买量
- redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
- } else {
- makeCoinRemain = makeCoinRemain.subtract(flow.getAmount());
-
- // 修改铸池量
- redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
- }
- } else {
- throw new FebsException("参数错误");
- }
} else {
- dappFundFlowDao.deleteById(transferDto.getId());
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+ if (flow.getStatus() == 1) {
+ dappFundFlowDao.deleteById(transferDto.getId());
+ }
}
return null;
}
@@ -291,12 +242,10 @@
public Map<String, BigDecimal> calPrice(PriceDto priceDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
-
- String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
- if (!"start".equals(hasStart)) {
+ if (!dappSystemService.systemHasStart()) {
HashMap<String, BigDecimal> map = new HashMap<>();
- map.put("x", new BigDecimal("0.075"));
- map.put("y", new BigDecimal("100000"));
+ map.put("x", new BigDecimal("0.05"));
+ map.put("y", new BigDecimal("0.05"));
return map;
}
@@ -305,7 +254,7 @@
BigDecimal sourceU = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
// 源池代币剩余数量
BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
- // 用户代币剩余数量
+ // 用户卖出数量
BigDecimal coin = priceDto.getAmount();
BigDecimal x = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_UP);
BigDecimal y = sourceU.divide(sourceCoin.add(coin), tfcInstance.decimals(), RoundingMode.HALF_UP);
@@ -316,4 +265,120 @@
map.put("y", y);
return map;
}
+
+ @Override
+ public ActiveNftListVo boxSurprise() {
+ 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();
+
+ 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 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(price.get("x").multiply(new BigDecimal(activeDto.getCount())));
+ 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);
+ 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