From e7cfd6e115dde2d7aadbdb6baeaeba7f948789d5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 28 Aug 2022 20:07:30 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java | 123 ++++++++++------------------------------
1 files changed, 32 insertions(+), 91 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
index 60988b2..968c301 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
@@ -16,6 +16,7 @@
import cc.mrbird.febs.dapp.mapper.DappOnlineTransferDao;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.service.DappSystemService;
+import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.OnlineTransferUtil;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.collection.CollUtil;
@@ -41,9 +42,6 @@
public class BscCoinContractEvent implements ContractEventService {
@Resource
- private DappMemberDao dappMemberDao;
-
- @Resource
private DappMemberService dappMemberService;
@Resource
@@ -52,14 +50,8 @@
@Resource
private RedisUtils redisUtils;
- @Autowired
- private DappSystemService dappSystemService;
-
@Resource
- private DappOnlineTransferDao dappOnlineTransferDao;
-
- @Resource
- private ChainProducer chainProducer;
+ private DappWalletService dappWalletService;
public static void main(String[] args) {
System.out.println(Numeric.toBigInt("0x12e4e85"));
@@ -68,7 +60,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
public void compile(EthUsdtContract.TransferEventResponse e) {
- if (e.to != null) {
+ if (e.to != null && e.to.equals(ChainEnum.BSC_TFC.getAddress().toLowerCase())) {
log.info("触发TFC监听");
try {
@@ -80,100 +72,49 @@
redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber());
int decimals = ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals();
- // 合约创建时，同时创建地址
- if ("0x0000000000000000000000000000000000000000".equals(e.from)) {
- DappMemberEntity toMember = dappMemberDao.selectByAddress(e.to, null);
- if (toMember == null) {
- toMember = dappMemberService.insertMember(e.to, "0", "BSC", "admin");
- }
+ // 更新余额
+ DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
+ if (fromMember == null) {
return;
}
- // 更新余额
- DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
- if (fromMember != null) {
- BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(e.from);
- fromMember.setBalance(balance);
- dappMemberService.updateById(fromMember);
- }
-
BigInteger tokens = e.tokens;
- BigDecimal amount = BigDecimal.valueOf(tokens.intValue()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
-
- // 如果转账对象地址不为源池地址，且对象地址在系统中存在并未激活，则激活用户
- if (!e.to.equals(ChainEnum.BSC_TFC_SOURCE.getAddress().toLowerCase())) {
- DappMemberEntity toMember = dappMemberDao.selectByAddress(e.to, null);
- if (toMember == null) {
-// toMember = dappMemberService.insertMember(e.to, fromMember.getInviteId());
- return;
- }
-
- if (toMember.getActiveStatus() == 2) {
- toMember.setActiveStatus(1);
- }
- // 更新余额
- BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(e.to);
- toMember.setBalance(balance);
- dappMemberService.updateById(toMember);
-
- OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_ONLINE, AppContants.SYMBOL_COIN);
- }
+ BigDecimal amount = new BigDecimal(tokens.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
// 卖币
- if (e.to.equals(ChainEnum.BSC_TFC_SOURCE.getAddress().toLowerCase())) {
- DappFundFlowEntity fundFlow = dappFundFlowDao.selectByFromHash(e.log.getTransactionHash(), null);
- if (fundFlow != null && fundFlow.getStatus() != 1) {
+ DappFundFlowEntity fundFlow = dappFundFlowDao.selectByFromHash(e.log.getTransactionHash(), null);
+ if (fundFlow != null && fundFlow.getStatus() != 1) {
+ return;
+ }
+
+ if (fundFlow == null) {
+ List<DappFundFlowEntity> flows = dappFundFlowDao.selectFundFlowListByAddress(e.from, 1);
+ if (CollUtil.isEmpty(flows)) {
+ OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_ONLINE, AppContants.SYMBOL_COIN);
+ log.info("本地无交易:{}", e.log.getTransactionHash());
return;
}
- if (fundFlow == null) {
- List<DappFundFlowEntity> flows = dappFundFlowDao.selectFundFlowListByAddress(e.from, 1);
- if (CollUtil.isEmpty(flows)) {
- OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_ONLINE, AppContants.SYMBOL_COIN);
- log.info("本地无交易:{}", e.log.getTransactionHash());
- return;
- }
-
- boolean hasFlow = false;
- for (DappFundFlowEntity flow : flows) {
- if (flow.getStatus() == 1) {
- if (amount.compareTo(flow.getTargetAmount()) == 0) {
- hasFlow = true;
- fundFlow = flow;
- fundFlow.setFromHash(e.log.getTransactionHash());
- break;
- }
+ for (DappFundFlowEntity flow : flows) {
+ if (flow.getStatus() == 1) {
+ if (amount.compareTo(flow.getAmount()) == 0) {
+ fundFlow = flow;
+ fundFlow.setFromHash(e.log.getTransactionHash());
+ break;
}
}
-
- if (!hasFlow) {
- OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_ONLINE, AppContants.SYMBOL_COIN);
- return;
- }
}
- OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_APPLICATION, AppContants.SYMBOL_COIN);
-
- BigDecimal newPrice = fundFlow.getNewestPrice();
- BigDecimal transferAmount = amount.multiply(newPrice);
-
- // 更改状态为已同步
- fundFlow.setStatus(2);
- fundFlow.setTargetAmount(transferAmount);
- dappFundFlowDao.updateById(fundFlow);
-
- // 划点分配
- chainProducer.sendDitribProfit(fundFlow.getId());
-
- OnlineTransferUtil.addTransfer(e.from, transferAmount, fundFlow.getType(), 1, ChainEnum.BSC_USDT_SOURCE.name(), AppContants.SYMBOL_USDT, fundFlow.getId().toString());
-
- Map<String, String> map = new HashMap<>();
- map.put("batchNo", fundFlow.getId().toString());
- map.put("type", "flow");
-
- // 发送转账消息
- chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
}
+ if (fundFlow == null) {
+ return;
+ }
+
+ // 更改状态为已同步
+ fundFlow.setStatus(2);
+ dappFundFlowDao.updateById(fundFlow);
+
+ dappWalletService.updateWalletMineWithLock(amount, fromMember.getId());
}
}
}
--
Gitblit v1.9.1