From 35ba7780cd76437456081be4b5f475658a137765 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Aug 2022 12:48:36 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 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..955211f 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
@@ -10,6 +10,7 @@
import cc.mrbird.febs.dapp.mapper.DappOnlineTransferDao;
import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
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;
@@ -48,6 +49,9 @@
private DappOnlineTransferDao dappOnlineTransferDao;
@Resource
private DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+ @Autowired
+ private DappSystemService dappSystemService;
@Override
@@ -103,7 +107,7 @@
boolean hasFlow = false;
for (DappFundFlowEntity flow : flows) {
if (flow.getStatus() == 1) {
- if (amount.compareTo(flow.getTargetAmount()) == 0) {
+ if (amount.compareTo(flow.getAmount().multiply(flow.getNewestPrice()).setScale(4, RoundingMode.HALF_UP)) == 0) {
hasFlow = true;
fundFlow = flow;
fundFlow.setFromHash(e.log.getTransactionHash());
@@ -120,6 +124,17 @@
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.setStatus(2);
fundFlow.setTargetAmount(amount);
@@ -127,7 +142,7 @@
// 如果系统会开启，则使用自动打款
if (!"start".equals(hasStart)) {
- OnlineTransferUtil.addTransfer(e.from, fundFlow.getAmount(), 1, 1, ChainEnum.BSC_TFC_MAKE.name(), "BSC", fundFlow.getId().toString());
+ 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());
@@ -136,18 +151,14 @@
// 发送转账消息
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());
+ // 发送盲盒消息
+ chainProducer.sendNftBoxMsg(fundFlow.getId());
- // 若源池中的USDT达到或超过8万U，则启动整个系统
- BigDecimal balance = sourceUsdtInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
- if (target.compareTo(balance) < 1) {
- redisUtils.set(AppContants.SYSTEM_START_FLAG, "start");
-
-
- }
+ fromMember.setMakerType(1);
+ dappMemberService.updateById(fromMember);
} else {
- OnlineTransferUtil.addTransfer(e.from, fundFlow.getAmount(), 1, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, fundFlow.getId().toString());
+ // 买入收手续费，到账币数量减去手续费
+ 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());
@@ -158,6 +169,9 @@
// 发送购买奖励消息
chainProducer.sendUserBuyReward(fundFlow.getId());
+
+ // 发送盲盒消息
+ chainProducer.sendNftBoxMsg(fundFlow.getId());
}
}
}
--
Gitblit v1.9.1