From 5fee2d8109856b96b6589b736df9e72ea78b99d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 12:41:38 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 21 +++++++++++++--------
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 17 -----------------
2 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 9fc1c1c..8cfe42b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -651,6 +651,12 @@
return;
}
+ DataDictionaryCustom data = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
+ BigDecimal miniLimit = new BigDecimal(data.getValue());
+ if (fundFlow.getTargetAmount().compareTo(miniLimit) < 0) {
+ return;
+ }
+
if (!hasProfit(parent.getAddress())) {
return;
}
@@ -673,22 +679,21 @@
}
}
+ DappMemberBoxRecordEntity memberBoxRecordEntity = new DappMemberBoxRecordEntity();
+ memberBoxRecordEntity.setMemberId(parent.getId());
+ memberBoxRecordEntity.setAddress(parent.getAddress());
+ memberBoxRecordEntity.setFromMemberId(member.getId());
+ memberBoxRecordEntity.setFromAddress(member.getAddress());
+ this.dappMemberBoxRecordMapper.insert(memberBoxRecordEntity);
+
if (box > 0) {
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(parent.getId());
walletCoin.setBoxCnt(walletCoin.getBoxCnt() + box);
dappWalletCoinDao.updateById(walletCoin);
- DappMemberBoxRecordEntity memberBoxRecordEntity = new DappMemberBoxRecordEntity();
- memberBoxRecordEntity.setMemberId(parent.getId());
- memberBoxRecordEntity.setAddress(parent.getAddress());
- memberBoxRecordEntity.setFromMemberId(member.getId());
- memberBoxRecordEntity.setFromAddress(member.getAddress());
- this.dappMemberBoxRecordMapper.insert(memberBoxRecordEntity);
-
DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(parent.getId(), new BigDecimal(box), 5, 2, BigDecimal.ZERO);
dappFundFlowDao.insert(boxFundFlow);
}
-
}
@Override
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 097536b..04e8669 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
@@ -387,23 +387,6 @@
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();
--
Gitblit v1.9.1