From 60f9b412d8c49501dc55a4ffd8f4a63a69043cd0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 08 Jun 2022 09:37:02 +0800
Subject: [PATCH] fix transfer
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 32c165d..8ee15b5 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
@@ -9,10 +9,16 @@
import cc.mrbird.febs.dapp.chain.EthUsdtContract;
import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cc.mrbird.febs.dapp.entity.DappOnlineTransferEntity;
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.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.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,6 +29,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.Map;
@Service
public class BscCoinContractEvent implements ContractEventService {
@@ -39,7 +47,14 @@
@Resource
private RedisUtils redisUtils;
- private final String ADDRESS = "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25";
+ @Autowired
+ private DappSystemService dappSystemService;
+
+ @Resource
+ private DappOnlineTransferDao dappOnlineTransferDao;
+
+ @Resource
+ private ChainProducer chainProducer;
public static void main(String[] args) {
System.out.println(Numeric.toBigInt("0x12e4e85"));
@@ -61,39 +76,52 @@
return;
}
- DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
- if (fromMember == null) {
- DappMemberEntity sourceAddress = dappMemberDao.selectByAddress(ChainEnum.BSC_TFC.getAddress(), null);
- fromMember = dappMemberService.insertMember(e.from, sourceAddress.getInviteId());
- }
+// DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
+// if (fromMember == null) {
+// DappMemberEntity sourceAddress = dappMemberDao.selectByAddress(ChainEnum.BSC_TFC.getAddress(), null);
+// fromMember = dappMemberService.insertMember(e.from, sourceAddress.getInviteId());
+// return;
+// }
- // 如果转账对象地址不为源池地址，则创建用户
- if (!e.to.equals(ADDRESS)) {
+ // 如果转账对象地址不为源池地址，且对象地址在系统中存在并未激活，则激活用户
+ if (!e.to.equals(ChainEnum.BSC_TFC_SOURCE.getAddress())) {
DappMemberEntity toMember = dappMemberDao.selectByAddress(e.to, null);
if (toMember == null) {
- toMember = dappMemberService.insertMember(e.to, fromMember.getInviteId());
+// toMember = dappMemberService.insertMember(e.to, fromMember.getInviteId());
+ return;
+ }
+
+ if (toMember.getActiveStatus() == 2) {
+ toMember.setActiveStatus(1);
+ dappMemberService.updateById(toMember);
}
}
// 卖币
- if (e.to.equals(ADDRESS)) {
+ if (e.to.equals(ChainEnum.BSC_TFC_SOURCE.getAddress())) {
BigInteger tokens = e.tokens;
BigDecimal amount = BigDecimal.valueOf(tokens.intValue()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
DappFundFlowEntity fundFlow = dappFundFlowDao.selectByFromHash(e.log.getTransactionHash(), 1);
BigDecimal newPrice = fundFlow.getNewestPrice();
BigDecimal transferAmount = amount.multiply(newPrice);
+
// 更改状态为已同步
fundFlow.setStatus(2);
fundFlow.setTargetAmount(transferAmount);
dappFundFlowDao.updateById(fundFlow);
- // TODO 划点分配
+ // 划点分配
+ dappSystemService.tradeProfitDistribute(fundFlow.getId());
- // TODO 自动转账
-// String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(e.from, transferAmount);
-// fundFlow.setToHash(hash);
-// dappFundFlowDao.updateById(fundFlow);
+ OnlineTransferUtil.addTransfer(e.from, transferAmount, fundFlow.getType(), 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));
}
}
--
Gitblit v1.9.1