From fbe58daf33d7e5c49bbf77578f0af9dfec90a5fb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 14 Jul 2022 18:55:46 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 3 ++-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 8 +++++++-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 12 +++++++-----
src/main/resources/application-test.yml | 2 +-
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 8 ++++----
6 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
index dac3462..ba862f9 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -15,10 +15,10 @@
* 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
*/
BSC_USDT("BSC",
- "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
- "",
+ "0xBae24dAa3aB94cfF8114a16A4267D769b3a651F8",
+ "111",
"https://bsc-dataseed1.ninicoin.io",
- "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
+ "0x46ac4921e58773ca22826df1640672b91b1db2b3",
""),
/**
@@ -26,7 +26,7 @@
*/
BSC_NFT_SDC("BSC",
"0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
- "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
"https://bsc-dataseed1.ninicoin.io",
"0x03c7D3f141c5F03971604958170E253362e13BE6",
""),
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
index 73ba60b..5865bf4 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -380,7 +380,7 @@
String encodedFunction = FunctionEncoder.encode(function);
RawTransaction rawTransaction = RawTransaction.createTransaction(nonce,
Convert.toWei(gas, Convert.Unit.GWEI).toBigInteger(),
- Convert.toWei("100000", Convert.Unit.WEI).toBigInteger(), contractAddress, encodedFunction);
+ Convert.toWei("1000000", Convert.Unit.WEI).toBigInteger(), contractAddress, encodedFunction);
byte[] signedMessage = TransactionEncoder.signMessage(rawTransaction, credentials);
String hexValue = Numeric.toHexString(signedMessage);
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index 588d372..8273e10 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -57,7 +57,8 @@
@ApiOperation(value = "开盲盒", notes = "开盲盒")
@PostMapping(value = "/boxSurprise")
public FebsResponse boxSurprise() {
- return new FebsResponse().success().data(dappWalletService.boxSurprise());
+ int cnt = dappWalletService.boxSurprise();
+ return new FebsResponse().success().message("获得卡牌:" + cnt + "张");
}
// @ApiOperation(value = "记录列表", notes = "记录列表")
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index f63c304..d5a46b3 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -126,9 +126,11 @@
DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
if (member == null) {
- DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
- if (parent == null) {
- throw new FebsException("邀请人不存在");
+ if (StrUtil.isNotBlank(connectDto.getInviteId())) {
+ DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+ if (parent == null) {
+ throw new FebsException("邀请人不存在");
+ }
}
member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
@@ -282,8 +284,8 @@
member.setChainType(chainType);
member.setAccountType(accountType);
member.setActiveStatus(1);
- member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
- member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
+// member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
+// member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_SYSTEM_NODE_CNT_LIMIT);
int nodeCntLimit = Integer.parseInt(dic.getValue());
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 8cd297b..c9ae7d1 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
@@ -273,7 +273,13 @@
DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(box.getIndex()), 6, 2, BigDecimal.ZERO);
dappFundFlowDao.insert(boxFundFlow);
- // TODO 线上转账
+ new Thread(() -> {
+ int count = box.getIndex();
+ while(count > 0) {
+ ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
+ count--;
+ }
+ }).start();
return box.getIndex();
}
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 77e84ce..da24a34 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -50,5 +50,5 @@
system:
online-transfer: false
- chain-listener: false
+ chain-listener: true
trade-job: false
--
Gitblit v1.9.1