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 | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 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 c151442..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
@@ -61,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;
}
@@ -207,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;
@@ -274,14 +280,25 @@
dappFundFlowDao.insert(boxFundFlow);
new Thread(() -> {
- int count = box.getIndex();
- while(count > 0) {
- log.info("卡牌+1");
- ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
- count--;
+ 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