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 | 305 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 279 insertions(+), 26 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 1bb919e..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
@@ -5,11 +5,8 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
-import com.xcong.excoin.modules.blackchain.model.EosResult;
-import com.xcong.excoin.modules.blackchain.service.BtcService;
-import com.xcong.excoin.modules.blackchain.service.EosService;
-import com.xcong.excoin.modules.blackchain.service.EthService;
-import com.xcong.excoin.modules.blackchain.service.UsdtService;
+import com.xcong.excoin.modules.blackchain.model.*;
+import com.xcong.excoin.modules.blackchain.service.*;
import com.xcong.excoin.modules.coin.service.BlockCoinService;
import com.xcong.excoin.modules.member.dao.MemberCoinAddressDao;
import com.xcong.excoin.modules.member.dao.MemberCoinChargeDao;
@@ -26,6 +23,7 @@
import com.xcong.excoin.utils.mail.Sms106Send;
import com.xcong.excoin.utils.mail.SubMailSend;
import lombok.extern.slf4j.Slf4j;
+import lombok.val;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -34,8 +32,12 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -55,9 +57,16 @@
private MemberWalletCoinDao memberWalletCoinDao;
@Resource
+ private UsdtEthService usdtEthService;
+
+ @Resource
private RedisUtils redisUtils;
- private final static String EOS_SEQ_KEY="eos_seq_key";
+ private final static String EOS_SEQ_KEY = "eos_seq_key";
+
+ private final static String xrp_update_key = "xrp_update_key";
+
+ private final static String trc20_update_key = "trc20_update_key";
@Transactional(rollbackFor = Exception.class)
@Override
@@ -95,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);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance, null);
// 插入财务记录
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);
@@ -123,7 +132,7 @@
Long memberId = coinAddressEntity.getMemberId();
BigDecimal balance = EthService.getEthBlance(address);
- if (balance != null && new BigDecimal("0.008").compareTo(balance) < 0) {
+ if (balance != null && new BigDecimal("0.01").compareTo(balance) < 0) {
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.ETH.name());
if (walletCoin == null) {
@@ -145,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);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.ETH.name(), null, balance, null);
// 插入财务记录
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.ETH.name(), 1, 1);
@@ -195,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);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "OMNI", balance, null);
ThreadPoolUtils.sendDingTalk(5);
MemberEntity member = memberDao.selectById(memberId);
@@ -243,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);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.BTC.name(), null, balance, null);
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.BTC.name(), 1, 1);
ThreadPoolUtils.sendDingTalk(5);
@@ -263,49 +272,49 @@
@Override
public void updateEos() {
// 获取上次读取的序号
- int pos= 0;
+ int pos = 0;
//每次获取的条数
int offset = 10;
String eosSeq = redisUtils.getString(EOS_SEQ_KEY);
- if(StringUtils.isNotBlank(eosSeq)){
+ if (StringUtils.isNotBlank(eosSeq)) {
pos = Integer.valueOf(eosSeq);
}
// 记录最大的seq
int seq = pos;
List<EosResult> actions = EosService.getActions(pos, offset);
- if(CollectionUtils.isNotEmpty(actions)){
- for(EosResult eosResult:actions){
+ if (CollectionUtils.isNotEmpty(actions)) {
+ for (EosResult eosResult : actions) {
String to = eosResult.getTo();
Integer accountActionSeq = eosResult.getAccountActionSeq();
- if(accountActionSeq>seq){
+ if (accountActionSeq > seq) {
seq = accountActionSeq;
}
- if(!EosService.ACCOUNT.equals(to)){
+ if (!EosService.ACCOUNT.equals(to)) {
// 判断是否是收款
continue;
}
// 处理收款
String quantity = eosResult.getQuantity();
String memo = eosResult.getMemo();
- if(StringUtils.isBlank(memo)){
+ if (StringUtils.isBlank(memo)) {
// 没有标记的跳过
continue;
}
- if(StringUtils.isNotBlank(quantity)){
+ if (StringUtils.isNotBlank(quantity)) {
// 转账额
String amountStr = quantity.split("")[0];
BigDecimal amount = new BigDecimal(amountStr);
List<MemberCoinAddressEntity> memberCoinAddress = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.EOS.name(), memo);
- if(CollectionUtils.isNotEmpty(memberCoinAddress)){
+ if (CollectionUtils.isNotEmpty(memberCoinAddress)) {
MemberCoinAddressEntity memberCoinAddressEntity = memberCoinAddress.get(0);
// 用户ID
Long memberId = memberCoinAddressEntity.getMemberId();
MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.EOS.name());
- if(memberCoinAddressEntity!=null){
- memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(),amount,BigDecimal.ZERO,0);
+ if (memberCoinAddressEntity != null) {
+ memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(), amount, BigDecimal.ZERO, 0);
// 添加冲币记录
- String orderNo = insertCoinCharge(EosService.ACCOUNT,memberId,amount,CoinTypeEnum.EOS.name(),memo,BigDecimal.ZERO);
+ 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);
@@ -322,8 +331,250 @@
}
}
// 最后更新seq 即下次查询的起始位置 在本次最大的基础上加一
- if(seq>0 && seq>pos){
- redisUtils.set(EOS_SEQ_KEY,seq+1);
+ if (seq > 0 && seq > pos) {
+ redisUtils.set(EOS_SEQ_KEY, seq + 1);
+ }
+ }
+
+ public void updateXrp() {
+ // 首先去查redis上的上次同步时间
+ Object lastUpdateTime = redisUtils.get(xrp_update_key);
+ SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-dd hh:mm:ss");
+ Date start = null;
+ if (lastUpdateTime == null) {
+ // 没有 说明是第一次同步 此时从第一天开始同步2020 0716开始
+ try {
+ start = format.parse("2020-07-16 12:00:00");
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ } else {
+ // 有上次时间
+ try {
+ start = format.parse(lastUpdateTime.toString());
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+
+ // 去查询上次同步时间后的所有记录
+ XrpTransResult result = XrpService.getTransactions(start);
+ // 写入本次更新时间
+ String updateTime = format.format(new Date());
+ redisUtils.set(xrp_update_key, updateTime);
+ // 判断有无
+ List<XrpTransactions> list = result.getTransactions();
+ if (CollectionUtils.isNotEmpty(list)) {
+ // 不为空 说明有转入记录
+ for (XrpTransactions item : list) {
+ XrpTx data = item.getTx();
+ Integer amountOld = data.getAmount();
+ // 除以1000000
+ BigDecimal amount = new BigDecimal(amountOld).divide(new BigDecimal(1000000));
+ Integer memoInt = data.getDestinationTag();
+ // 没有标签直接返回
+ if (memoInt == null) {
+ continue;
+ }
+ String memo = memoInt.toString();
+ String destination = data.getDestination();
+ // 判断收款人是不是系统账号
+ if (!XrpService.ACCOUNT.equals(destination)) {
+ continue;
+ }
+ List<MemberCoinAddressEntity> memberCoinAddress = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.XRP.name(), memo);
+ if (CollectionUtils.isNotEmpty(memberCoinAddress)) {
+ MemberCoinAddressEntity memberCoinAddressEntity = memberCoinAddress.get(0);
+ // 用户ID
+ Long memberId = memberCoinAddressEntity.getMemberId();
+ MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XRP.name());
+ 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);
+ LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.XRP.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);
+ }
+ }
+ }
+
+ }
+ }
+
+ }
+
+ @Override
+ 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;
+ }
+
+ 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");
+ 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
+ public void updateRoc(RocTransferDetail transferDetail) {
+ // 更新ROC
+ // 增加用户余额
+ 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) {
+ return;
+ }
+
+ if (balance.compareTo(new BigDecimal("0.0001")) <= 0) {
+ return;
+ }
+
+ MemberCoinAddressEntity memberCoinAddress = memberCoinAddressDao.selectCoinAddressByAddressAndSymbol(address, symbol);
+ if (memberCoinAddress == null) {
+ return;
+ }
+ Long memberId = memberCoinAddress.getMemberId();
+ // 查询钱包 并更新
+ MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
+ if (walletCoinEntity == null) {
+ // 创建一个钱包
+ // 创建这个钱包
+ walletCoinEntity = new MemberWalletCoinEntity();
+ walletCoinEntity.setAvailableBalance(BigDecimal.ZERO);
+ walletCoinEntity.setFrozenBalance(BigDecimal.ZERO);
+ walletCoinEntity.setTotalBalance(BigDecimal.ZERO);
+ walletCoinEntity.setBorrowedFund(BigDecimal.ZERO);
+ walletCoinEntity.setMemberId(memberId);
+ walletCoinEntity.setWalletCode(symbol);
+ memberWalletCoinDao.insert(walletCoinEntity);
+ }
+
+ memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), balance, BigDecimal.ZERO, 0);
+
+ String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.XCT.name(), "", BigDecimal.ZERO, null);
+ // 插入财务记录
+ LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.XCT.name(), 1, 1);
+
+ try {
+ ThreadPoolUtils.sendDingTalk(5);
+ MemberEntity member = memberDao.selectById(memberId);
+ if (StrUtil.isNotBlank(member.getPhone())) {
+ 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) {
+ //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){
+
+ }
+
+
}
}
@@ -335,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) {
+ 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);
@@ -344,9 +595,11 @@
memberCoinChargeEntity.setTag(tag);
memberCoinChargeEntity.setStatus(1);
memberCoinChargeEntity.setLastAmount(lastAmount);
+ memberCoinChargeEntity.setHash(hash);
String orderNo = generateNo();
memberCoinChargeEntity.setOrderCode(orderNo);
memberCoinChargeDao.insert(memberCoinChargeEntity);
return orderNo;
}
+
}
--
Gitblit v1.9.1