From c0989001fbddc1b6e24783c3a4b8cb8775eab1fe Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 06 Nov 2022 19:32:01 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 83 +++++------------------------------------
1 files changed, 11 insertions(+), 72 deletions(-)
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 40647d3..abbc930 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
@@ -5,11 +5,9 @@
import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.dapp.chain.*;
import cc.mrbird.febs.dapp.entity.*;
-import cc.mrbird.febs.dapp.mapper.DappFundFlowDao;
-import cc.mrbird.febs.dapp.mapper.DappMemberDao;
-import cc.mrbird.febs.dapp.mapper.DappOnlineTransferDao;
-import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.utils.OnlineTransferUtil;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.collection.CollUtil;
@@ -34,20 +32,12 @@
@Resource
private RedisUtils redisUtils;
-
- @Resource
- private DappMemberService dappMemberService;
-
@Resource
private DappFundFlowDao dappFundFlowDao;
-
+ @Resource
+ private DappWalletCoinDao dappWalletCoinDao;
@Resource
private ChainProducer chainProducer;
-
- @Resource
- private DappOnlineTransferDao dappOnlineTransferDao;
- @Resource
- private DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
@@ -58,7 +48,7 @@
redisUtils.set(AppContants.REDIS_KEY_BLOCK_USDT_NUM, e.log.getBlockNumber());
// 判断对方打款地址是否为源池地址
- if (ChainEnum.BSC_TFC_SOURCE.getAddress().toLowerCase().equals(e.to)) {
+ if (ChainEnum.BSC_USDT.getAddress().toLowerCase().equals(e.to)) {
log.info("触发USDT合约监听事件");
redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber());
@@ -74,15 +64,6 @@
if (e.from.equals("0xaa25aa7a19f9c426e07dee59b12f944f4d9f1dd3")) {
return;
}
-
- DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
- // 如果此时fromMember为null，则说明该用户未经过转账绑定关系，而是直接注册并购买币，则将关系绑定到顶级账户
- if (fromMember == 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 = new BigDecimal(tokens.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
@@ -100,69 +81,27 @@
return;
}
- boolean hasFlow = false;
for (DappFundFlowEntity flow : flows) {
if (flow.getStatus() == 1) {
- if (amount.compareTo(flow.getTargetAmount()) == 0) {
- hasFlow = true;
+ if (amount.compareTo(flow.getAmount().multiply(flow.getNewestPrice()).setScale(4, RoundingMode.HALF_UP)) == 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, "USDT");
- return;
- }
}
- OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_APPLICATION, "USDT");
+ if (fundFlow == null) {
+ return;
+ }
+ fundFlow.setAmount(fundFlow.getAmount().negate());
// 更改状态为已同步
fundFlow.setStatus(2);
- fundFlow.setTargetAmount(amount);
dappFundFlowDao.updateById(fundFlow);
- // 如果系统会开启，则使用自动打款
- if (!"start".equals(hasStart)) {
- OnlineTransferUtil.addTransfer(e.from, fundFlow.getAmount(), 1, 1, ChainEnum.BSC_TFC_MAKE.name(), "BSC", fundFlow.getId().toString());
-
- Map<String, String> map = new HashMap<>();
- map.put("batchNo", fundFlow.getId().toString());
- map.put("type", "flow");
-
- // 发送转账消息
- chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
-
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_SYSTEM_START_TARGET);
- BigDecimal target = new BigDecimal(dic.getValue());
-
- // 若源池中的USDT达到或超过8万U，则启动整个系统
- BigDecimal balance = sourceUsdtInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
- if (target.compareTo(balance) < 1) {
- redisUtils.set(AppContants.SYSTEM_START_FLAG, "start");
-
-
- }
- } else {
- OnlineTransferUtil.addTransfer(e.from, fundFlow.getAmount(), 1, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, fundFlow.getId().toString());
-
- Map<String, String> map = new HashMap<>();
- map.put("batchNo", fundFlow.getId().toString());
- map.put("type", "flow");
-
- // 发送转账消息
- chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
-
- // 发送购买奖励消息
- chainProducer.sendUserBuyReward(fundFlow.getId());
- }
+ chainProducer.sendAchieveTreeMsg(fundFlow.getMemberId());
}
- }
-
- public static void main(String[] args) {
- System.out.println(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf("0x9DDE1834683D642D4D077498DC7fbdb8CF70E8FE"));
}
}
--
Gitblit v1.9.1