From e1992f204a135a347a89a5859a8fe54033401b7e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 30 May 2022 16:34:05 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 47 +++++++++++++++++------
src/main/java/cc/mrbird/febs/common/contants/AppContants.java | 2 +
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 4 +-
src/main/java/cc/mrbird/febs/dapp/dto/SystemDto.java | 6 +++
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 17 +++++++-
5 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/contants/AppContants.java b/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
index 6e7d01e..3d43d68 100644
--- a/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
+++ b/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
@@ -102,4 +102,6 @@
public static final String REDIS_KEY_ETH_NEW_PRICE = "ETH_NEW_PRICE";
public static final String REDIS_KEY_CHANGE_FEE = "DAPP_CHANGE_FEE";
public static final String REDIS_KEY_SIGN = "LOGIN_SIGN";
+
+ public static final String SYSTEM_START_FLAG = "SYSTEM_START_FLAG";
}
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 c3895d7..cb1c85f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -23,6 +23,10 @@
"TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
"9d461be6-9796-47b9-85d8-b150cbabbb54"),
+
+ /**
+ * 币安 usdt合约
+ */
BSC_USDT("BSC", "0x971c09aA9735EB98459B17EC8b48932D24CbB931",
"0x5f38d0e63157f535fc21f89ea13ec3cd245691c20795c1d2cb60233b3ba7bb47",
"https://bsc-dataseed1.ninicoin.io",
@@ -42,7 +46,7 @@
* 源池币
*/
BSC_TFC_SOURCE("BSC", "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
- "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ "",
"https://bsc-dataseed1.ninicoin.io",
"0x6c6835e60e7dbad7a60112a6371271e8eb79ee68",
""),
@@ -51,9 +55,18 @@
* 源池U
*/
BSC_USDT_SOURCE("BSC", "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
- "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ "",
"https://bsc-dataseed1.ninicoin.io",
"0x55d398326f99059fF775485246999027B3197955",
+ ""),
+
+ /**
+ * 铸池币
+ */
+ BSC_TFC_MAKE("BSC", "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
+ "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ "https://bsc-dataseed1.ninicoin.io",
+ "0x6c6835e60e7dbad7a60112a6371271e8eb79ee68",
"");
private String chain;
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/SystemDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/SystemDto.java
index be00c76..078760e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/dto/SystemDto.java
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/SystemDto.java
@@ -26,6 +26,12 @@
@ApiModelProperty(value = "今天可买剩余")
private BigDecimal buyRemain;
+ @ApiModelProperty(value = "出USDT总数")
+ private BigDecimal usdtTotal;
+
+ @ApiModelProperty(value = "出USDT剩余")
+ private BigDecimal usdtRemain;
+
@ApiModelProperty(value = "滑点(%)")
private BigDecimal feeRatio;
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
index 0d3d668..3c5f2c5 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
@@ -1,10 +1,9 @@
package cc.mrbird.febs.dapp.service.impl;
+import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
-import cc.mrbird.febs.dapp.chain.ChainEnum;
-import cc.mrbird.febs.dapp.chain.ChainService;
-import cc.mrbird.febs.dapp.chain.ContractEventService;
-import cc.mrbird.febs.dapp.chain.EthUsdtContract;
+import cc.mrbird.febs.dapp.chain.*;
import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.mapper.DappFundFlowDao;
@@ -26,22 +25,31 @@
public class BscUsdtContractEvent implements ContractEventService {
@Resource
+ private RedisUtils redisUtils;
+
+ @Resource
private DappMemberService dappMemberService;
@Resource
private DappFundFlowDao dappFundFlowDao;
- private final String ADDRESS = "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25";
@Override
public void compile(EthUsdtContract.TransferEventResponse e) {
- int decimals = ChainService.getInstance(ChainEnum.BSC_USDT.name()).decimals();
+ ContractChainService sourceUsdtInstance = ChainService.getInstance(ChainEnum.BSC_USDT.name());
+ int decimals = sourceUsdtInstance.decimals();
int tfcDecimals = ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals();
- if (ADDRESS.equals(e.to)) {
+
+ // 判断对方打款地址是否为源池地址
+ if (ChainEnum.BSC_TFC_SOURCE.getAddress().equals(e.to)) {
DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
+ // 如果此时fromMember为null，则说明该用户未经过转账绑定关系，而是直接注册并购买币，则将关系绑定到顶级账户
if (fromMember == null) {
- fromMember = dappMemberService.insertMember(e.from, null);
+ DappMemberEntity toAddress = dappMemberService.findByAddress(e.to, null);
+ fromMember = dappMemberService.insertMember(e.from, toAddress.getInviteId());
}
+
+ String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
BigInteger tokens = e.tokens;
BigDecimal amount = BigDecimal.valueOf(tokens.intValue()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
@@ -55,10 +63,25 @@
fundFlow.setTargetAmount(transferAmount);
dappFundFlowDao.updateById(fundFlow);
-// BigDecimal transferAmount = amount.multiply(newPrice);
-// String hash = ChainService.getInstance(ChainEnum.BSC_TFC.name()).transfer(e.from, transferAmount);
-// fundFlow.setToHash(hash);
-// dappFundFlowDao.updateById(fundFlow);
+ // 如果系统会开启，则使用自动打款
+ if (!"start".equals(hasStart)) {
+ String hash = ChainService.getInstance(ChainEnum.BSC_TFC_MAKE.name()).transfer(e.from, transferAmount);
+
+ // 更新为已打款
+ fundFlow.setStatus(3);
+ fundFlow.setToHash(hash);
+ dappFundFlowDao.updateById(fundFlow);
+ }
+
+ // 若源池中的USDT达到或超过8万U，则启动整个系统
+ BigDecimal balance = sourceUsdtInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+ if (BigDecimal.valueOf(80000).compareTo(balance) < 1) {
+ redisUtils.set(AppContants.SYSTEM_START_FLAG, "start");
+ }
}
}
+
+ public static void main(String[] args) {
+ System.out.println(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf("0x9DDE1834683D642D4D077498DC7fbdb8CF70E8FE"));
+ }
}
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 ca0245c..92ae21b 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
@@ -213,9 +213,9 @@
public Map<String, BigDecimal> calPrice() {
DappMemberEntity member = LoginUserUtil.getAppUser();
- ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC_SOURCE.name());
+ ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
// u剩余数量
- BigDecimal sourceU = ChainService.getInstance(ChainEnum.BSC_USDT_SOURCE.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+ BigDecimal sourceU = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
// 源池代币剩余数量
BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
// 用户代币剩余数量
--
Gitblit v1.9.1