From a39df92a62edee1cee74c8aee97489dd16de5b66 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 22 Jul 2022 10:59:37 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 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 3233151..442c19d 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
@@ -17,6 +17,7 @@
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappWalletService;
+import cc.mrbird.febs.dapp.utils.BoxUtil;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -60,6 +61,8 @@
walletInfo.setCoinAmount(idoAssets.getCoinAmount());
walletInfo.setUsdtAmount(idoAssets.getUsdtAmount());
walletInfo.setInviteId(member.getInviteId());
+ List<DappMemberEntity> childList = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1);
+ walletInfo.setDirectCnt(CollUtil.isNotEmpty(childList) ? childList.size() : 0);
return walletInfo;
}
@@ -206,21 +209,25 @@
DappMemberEntity member = LoginUserUtil.getAppUser();
if (transferDto.getId() == null) {
+ if (new BigDecimal(300).compareTo(transferDto.getAmount()) < 0) {
+ throw new FebsException("Do Not More Than 300 USDT");
+ }
+
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);
} else {
- DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
- if (flow.getStatus() == 1) {
- dappFundFlowDao.deleteById(transferDto.getId());
+ if ("success".equals(transferDto.getFlag())) {
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+
+ flow.setFromHash(transferDto.getTxHash());
+ dappFundFlowDao.updateById(flow);
+ } else {
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+ if (flow.getStatus() == 1) {
+ dappFundFlowDao.deleteById(transferDto.getId());
+ }
}
}
return null;
@@ -267,8 +274,31 @@
idoAssets.setBoxCnt(idoAssets.getBoxCnt() - 1);
dappIdoAssetsDao.updateById(idoAssets);
- // TODO 线上转账
+ BoxUtil.Box box = BoxUtil.openBox();
- return 1;
+ 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();
+ }
+
+ @Override
+ public IPage<DappIdoAssetsEntity> selectIdoAchieveInPage(DappIdoAssetsEntity dappIdoAssetsEntity, QueryRequest request) {
+ Page<DappIdoAssetsEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.dappIdoAssetsDao.selectAchieveListInPage(dappIdoAssetsEntity, page);
}
}
--
Gitblit v1.9.1