From 5264c0165e3dbdeec367081ea68e18bffc4bd060 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Aug 2022 16:17:25 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 113 +++-----------------------------------------------------
1 files changed, 7 insertions(+), 106 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 798a7d7..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,10 +5,7 @@
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;
@@ -35,23 +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;
-
- @Autowired
- private DappSystemService dappSystemService;
@Override
@@ -62,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());
@@ -78,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);
@@ -104,103 +81,27 @@
return;
}
- boolean hasFlow = false;
for (DappFundFlowEntity flow : flows) {
if (flow.getStatus() == 1) {
if (amount.compareTo(flow.getAmount().multiply(flow.getNewestPrice()).setScale(4, RoundingMode.HALF_UP)) == 0) {
- hasFlow = true;
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;
- }
}
- // 激活卡牌
- if (fundFlow.getType() == 8) {
- DappFundFlowEntity finalFundFlow = fundFlow;
- DappMemberEntity member = dappMemberService.getById(fundFlow.getMemberId());
-
- new Thread(() -> {
- try {
- int count = finalFundFlow.getAmount().intValue();
- String token = null;
- while (count > 0) {
- token = ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
- Thread.sleep(5000);
- count--;
- }
- finalFundFlow.setToHash(token);
- dappFundFlowDao.updateById(finalFundFlow);
- } catch (Exception ex) {
- ex.printStackTrace();
- log.error("发放卡牌错误", ex);
- }
- }).start();
+ if (fundFlow == null) {
return;
}
- OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_APPLICATION, "USDT");
-
-
- // 这个方法主要是处理，tp钱包在调用transfer时，交易详情中的金额可能因为网速慢而显示晚，从而导致实际转账比记录中的少，顾做此处理
- BigDecimal realCoin = amount.divide(fundFlow.getNewestPrice(), decimals, RoundingMode.HALF_UP);
- if (fundFlow.getAmount().subtract(new BigDecimal("0.1")).compareTo(realCoin) > 0) {
- fundFlow.setAmount(realCoin);
-
- BigDecimal subtract = fundFlow.getAmount().subtract(realCoin);
- BigDecimal poolRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
- redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, poolRemain.add(subtract));
- }
-
+ 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.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));
-
- // 发送盲盒消息
- chainProducer.sendNftBoxMsg(fundFlow.getId());
-
- fromMember.setMakerType(1);
- dappMemberService.updateById(fromMember);
- } else {
- // 买入收手续费，到账币数量减去手续费
- OnlineTransferUtil.addTransfer(e.from, fundFlow.getAmount().subtract(fundFlow.getFee()), 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.sendNftBoxMsg(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