From 8d053c03d0738efabc33183c1db20e05ced5cfb0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Nov 2021 16:01:23 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java | 208 +++++++++++++++++++++++++++++++--------------------
1 files changed, 125 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
index 5d1e101..cc332a8 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
@@ -57,6 +57,9 @@
private MemberWalletCoinDao memberWalletCoinDao;
@Resource
+ private UsdtEthService usdtEthService;
+
+ @Resource
private RedisUtils redisUtils;
private final static String EOS_SEQ_KEY = "eos_seq_key";
@@ -101,7 +104,7 @@
BigDecimal newBalance = balance.subtract(early);
memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), newBalance, balance, 0);
- String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance,null);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance, null);
// 插入财务记录
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);
@@ -151,7 +154,7 @@
BigDecimal newBalance = balance.subtract(early);
memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
- String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.ETH.name(), null, balance,null);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.ETH.name(), null, balance, null);
// 插入财务记录
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.ETH.name(), 1, 1);
@@ -201,7 +204,7 @@
BigDecimal newBalance = balance.subtract(early);
memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
- String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "OMNI", balance,null);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "OMNI", balance, null);
ThreadPoolUtils.sendDingTalk(5);
MemberEntity member = memberDao.selectById(memberId);
@@ -249,7 +252,7 @@
BigDecimal newBalance = balance.subtract(early);
memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
- String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.BTC.name(), null, balance,null);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.BTC.name(), null, balance, null);
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.BTC.name(), 1, 1);
ThreadPoolUtils.sendDingTalk(5);
@@ -311,7 +314,7 @@
if (memberCoinAddressEntity != null) {
memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(), amount, BigDecimal.ZERO, 0);
// 添加冲币记录
- String orderNo = insertCoinCharge(EosService.ACCOUNT, memberId, amount, CoinTypeEnum.EOS.name(), memo, BigDecimal.ZERO,null);
+ String orderNo = insertCoinCharge(EosService.ACCOUNT, memberId, amount, CoinTypeEnum.EOS.name(), memo, BigDecimal.ZERO, null);
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.EOS.name(), 1, 1);
ThreadPoolUtils.sendDingTalk(5);
@@ -388,7 +391,7 @@
if (memberCoinAddressEntity != null) {
memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(), amount, BigDecimal.ZERO, 0);
// 添加冲币记录
- String orderNo = insertCoinCharge(XrpService.ACCOUNT, memberId, amount, CoinTypeEnum.XRP.name(), memo, BigDecimal.ZERO,null);
+ String orderNo = insertCoinCharge(XrpService.ACCOUNT, memberId, amount, CoinTypeEnum.XRP.name(), memo, BigDecimal.ZERO, null);
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.XRP.name(), 1, 1);
ThreadPoolUtils.sendDingTalk(5);
@@ -408,77 +411,57 @@
}
@Override
- public void updateTrc20() {
- // 首先去查redis上的上次同步时间
- Object lastUpdateTime = redisUtils.get(trc20_update_key);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
- String start = null;
- if (lastUpdateTime == null) {
- // 没有 说明是第一次同步 此时从第一天开始同步2020 0905开始
- start = "2020-09-05'T'00:00";
- } else {
- // 有上次时间
- start = lastUpdateTime.toString();
+ public void updateTrc20(EthUsdtChargeDto dto) {
+ String address = dto.getAddress();
+ BigDecimal amount = dto.getBalance();
+ String hash = dto.getHash();
+ String symbol;
+
+ if (StrUtil.isBlank(dto.getSymbol())) {
+ log.error("更新trc20失败:{}, {}, {}, {}", hash, dto.getSymbol(), amount, address);
+ return;
}
- // 去查询上次同步时间后的所有记录
- //Trc20Service.getAddressTransactions()
- // 写入本次更新时间
- String updateTime = format.format(new Date());
- redisUtils.set(trc20_update_key, updateTime);
+ List<String> symbolArr = StrUtil.split(dto.getSymbol(), ',');
+ if (CollUtil.isEmpty(symbolArr) || symbolArr.size() != 2) {
+ log.error("更新trc20失败:{}, {}, {}, {}", hash, dto.getSymbol(), amount, address);
+ return;
+ }
+ symbol = symbolArr.get(0);
+
// 判断有无
- List<MemberCoinAddressEntity> addressList = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "TRC20");
- if (CollectionUtils.isNotEmpty(addressList)) {
- Map<String, Object> hashParam = new HashMap<>();
- for (MemberCoinAddressEntity coinAddressEntity : addressList) {
- String address = coinAddressEntity.getAddress();
- List<Trc20TransactionsData> addressTransactions = Trc20Service.getAddressTransactions(address, start);
- if (CollectionUtils.isNotEmpty(addressTransactions)) {
- for (Trc20TransactionsData trc20TransactionsData : addressTransactions) {
- String transactionId = trc20TransactionsData.getTransaction_id();
- String value = trc20TransactionsData.getValue();
- // 本次转账金额
- BigDecimal amount = new BigDecimal(value).divide(new BigDecimal("1000000"));
- // 校验token是否为trc20USD
- if (trc20TransactionsData.getToken_info() != null && trc20TransactionsData.getToken_info().containsKey("address")) {
- String tokenTrc = trc20TransactionsData.getToken_info().get("address").toString();
- if (!"TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t".equals(tokenTrc)) {
- continue;
- }
- } else {
- continue;
- }
- // 校验hash是否已同步过
- hashParam.put("hash", transactionId);
- List<MemberCoinChargeEntity> memberCoinChargeEntities = memberCoinChargeDao.selectByMap(hashParam);
- if (CollectionUtils.isNotEmpty(memberCoinChargeEntities)) {
- // 若已同步过
- continue;
- }
- // 添加钱包余额
- // 用户ID
- Long memberId = coinAddressEntity.getMemberId();
- MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
-
- memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(), amount, BigDecimal.ZERO, 0);
- // 添加冲币记录
- String orderNo = insertCoinCharge(address, memberId, amount, CoinTypeEnum.USDT.name(), "TRC20", BigDecimal.ZERO,transactionId);
- LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.USDT.name(), 1, 1);
-
- ThreadPoolUtils.sendDingTalk(5);
- MemberEntity member = memberDao.selectById(memberId);
- if (StrUtil.isNotBlank(member.getPhone())) {
- //String amountEos = amount + "XRP";
- Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
- } else {
- SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
- }
-
- }
- }
- }
+ //List<MemberCoinAddressEntity> addressList = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "TRC20");
+ Map<String, Object> hashParam = new HashMap<>();
+ // 校验hash是否已同步过
+ hashParam.put("hash", hash);
+ hashParam.put("symbol", symbol);
+ List<MemberCoinChargeEntity> memberCoinChargeEntities = memberCoinChargeDao.selectByMap(hashParam);
+ if (CollectionUtils.isNotEmpty(memberCoinChargeEntities)) {
+ // 若已同步过
+ return;
}
+ // 添加钱包余额
+ // 用户ID
+ MemberCoinAddressEntity memberCoinAddress = memberCoinAddressDao.selectCoinAddressByAddressAndSymbolTag(address, symbol,"TRC20");
+ if (memberCoinAddress == null) {
+ return;
+ }
+ Long memberId = memberCoinAddress.getMemberId();
+ // 查询钱包 并更新
+ MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
+ memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(), amount, BigDecimal.ZERO, 0);
+ // 添加冲币记录
+ String orderNo = insertCoinCharge(address, memberId, amount, symbol, "TRC20", BigDecimal.ZERO, hash);
+// LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.USDT.name(), 1, 1);
+ ThreadPoolUtils.sendDingTalk(5);
+ MemberEntity member = memberDao.selectById(memberId);
+ if (StrUtil.isNotBlank(member.getPhone())) {
+ //String amountEos = amount + "XRP";
+// Sms106Send.sendRechargeMsg(member.getPhone(), new Date(), amount+"U", orderNo);
+ } else {
+ SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
+ }
}
@Override
@@ -488,23 +471,23 @@
String address = transferDetail.getAddress();
BigDecimal balance = transferDetail.getBalance();
String symbol = transferDetail.getSymbol();
- if(org.apache.commons.lang.StringUtils.isBlank(address) || org.apache.commons.lang.StringUtils.isBlank(symbol) || balance ==null ){
+ if (org.apache.commons.lang.StringUtils.isBlank(address) || org.apache.commons.lang.StringUtils.isBlank(symbol) || balance == null) {
return;
}
- if(balance.compareTo(new BigDecimal("0.0001"))<=0){
+ if (balance.compareTo(new BigDecimal("0.0001")) <= 0) {
return;
}
MemberCoinAddressEntity memberCoinAddress = memberCoinAddressDao.selectCoinAddressByAddressAndSymbol(address, symbol);
- if(memberCoinAddress==null){
+ if (memberCoinAddress == null) {
return;
}
Long memberId = memberCoinAddress.getMemberId();
// 查询钱包 并更新
- MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.ROC.name());
+ MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
if (walletCoinEntity == null) {
- // 创建一个钱包
+ // 创建一个钱包
// 创建这个钱包
walletCoinEntity = new MemberWalletCoinEntity();
walletCoinEntity.setAvailableBalance(BigDecimal.ZERO);
@@ -518,23 +501,81 @@
memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), balance, BigDecimal.ZERO, 0);
- String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.ROC.name(), "", BigDecimal.ZERO,null);
+ String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.XCT.name(), "", BigDecimal.ZERO, null);
// 插入财务记录
- LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.ROC.name(), 1, 1);
+ LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.XCT.name(), 1, 1);
- try{
+ try {
ThreadPoolUtils.sendDingTalk(5);
MemberEntity member = memberDao.selectById(memberId);
if (StrUtil.isNotBlank(member.getPhone())) {
- String amount = balance.toPlainString() + "ROC";
+ String amount = balance.toPlainString() + "XCT";
Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
} else {
SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
}
- }catch (Exception e){
+ } catch (Exception e) {
//e.printStackTrace();
}
+ }
+
+ @Override
+ @Transactional
+ public void updateEthUsdtNew(EthUsdtChargeDto ethUsdtChargeDto) {
+ String address = ethUsdtChargeDto.getAddress();
+ String hash = ethUsdtChargeDto.getHash();
+ // hash没有用过
+ Map<String,Object> param = new HashMap<>();
+ param.put("hash",hash);
+ param.put("address",address);
+ List<MemberCoinChargeEntity> memberCoinChargeEntities = memberCoinChargeDao.selectByMap(param);
+ if(CollectionUtils.isNotEmpty(memberCoinChargeEntities)){
+ return;
+ }
+ // 校验这个交易是否成功
+ EthService ethService = new EthService();
+ boolean b = ethService.checkTransferResult(hash);
+ if(!b){
+ log.info("#USDT假充值:{}#", hash);
+ return;
+ }
+ MemberCoinAddressEntity coinAddressEntity = memberCoinAddressDao.selectCoinAddressByAddressAndSymbol(address, CoinTypeEnum.USDT.toString());
+ if (coinAddressEntity == null) {
+ return;
+ }
+ Long memberId = coinAddressEntity.getMemberId();
+ BigDecimal balance = ethUsdtChargeDto.getBalance();
+ if (balance != null && balance.compareTo(new BigDecimal("0.1")) > 0) {
+ balance = balance.setScale(8, RoundingMode.CEILING);
+ BigDecimal early = BigDecimal.ZERO;
+
+ MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
+ if (walletCoinEntity == null) {
+ return;
+ }
+ BigDecimal newBalance = balance.subtract(early);
+ memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), newBalance, balance, 0);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance, ethUsdtChargeDto.getHash());
+ // 插入财务记录
+ LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);
+ ThreadPoolUtils.sendDingTalk(5);
+ MemberEntity member = memberDao.selectById(memberId);
+ if (StrUtil.isNotBlank(member.getPhone())) {
+ String amount = newBalance.toPlainString() + "USDT-ERC20";
+ Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
+ } else {
+ SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
+ }
+ // 同步
+ try{
+ usdtEthService.pollByAddress(address);
+ }catch (Exception e){
+
+ }
+
+
+ }
}
private String generateNo() {
@@ -545,7 +586,7 @@
return String.valueOf(timestamp).substring(2) + random;
}
- public String insertCoinCharge(String address, Long memberId, BigDecimal newBalance, String symbol, String tag, BigDecimal lastAmount,String hash) {
+ public String insertCoinCharge(String address, Long memberId, BigDecimal newBalance, String symbol, String tag, BigDecimal lastAmount, String hash) {
MemberCoinChargeEntity memberCoinChargeEntity = new MemberCoinChargeEntity();
memberCoinChargeEntity.setAddress(address);
memberCoinChargeEntity.setMemberId(memberId);
@@ -560,4 +601,5 @@
memberCoinChargeDao.insert(memberCoinChargeEntity);
return orderNo;
}
+
}
--
Gitblit v1.9.1