From 1c043f5cda42801c0dcc830df5b95c6916dc5ec2 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 16 Jul 2020 20:05:08 +0800
Subject: [PATCH] XRP同步提交
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 215 insertions(+), 19 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 5ed9ee2..ba4e9ad 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
@@ -1,11 +1,15 @@
package com.xcong.excoin.modules.coin.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+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.service.BtcService;
-import com.xcong.excoin.modules.blackchain.service.EthService;
-import com.xcong.excoin.modules.blackchain.service.UsdtService;
+import com.xcong.excoin.modules.blackchain.model.EosResult;
+import com.xcong.excoin.modules.blackchain.model.XrpTransResult;
+import com.xcong.excoin.modules.blackchain.model.XrpTransactions;
+import com.xcong.excoin.modules.blackchain.model.XrpTx;
+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;
@@ -16,13 +20,24 @@
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
import com.xcong.excoin.utils.LogRecordUtils;
+import com.xcong.excoin.utils.RedisUtils;
+import com.xcong.excoin.utils.ThreadPoolUtils;
+import com.xcong.excoin.utils.dingtalk.DingTalkUtils;
+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;
import org.springframework.transaction.annotation.Transactional;
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.List;
/**
@@ -42,6 +57,13 @@
@Resource
private MemberWalletCoinDao memberWalletCoinDao;
+ @Resource
+ private RedisUtils redisUtils;
+
+ private final static String EOS_SEQ_KEY="eos_seq_key";
+
+ private final static String xrp_update_key = "xrp_update_key";
+
@Transactional(rollbackFor = Exception.class)
@Override
public void updateEthUsdt() {
@@ -52,7 +74,7 @@
String address = addressEntity.getAddress();
Long memberId = addressEntity.getMemberId();
- if (StrUtil.isNotBlank(address)) {
+ if (StrUtil.isBlank(address)) {
continue;
}
@@ -76,10 +98,20 @@
if (balance.compareTo(early) > 0) {
BigDecimal newBalance = balance.subtract(early);
- memberWalletCoinDao.updateBlockBalance(memberId, newBalance, balance, 0);
+ memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), newBalance, balance, 0);
- insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance);
- // TODO 钉钉发送, 短信提醒
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance);
+ // 插入财务记录
+ 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);
+ }
}
}
}
@@ -117,12 +149,20 @@
log.info("#ETH更新:{},{},{}#", memberId, balance, early);
BigDecimal newBalance = balance.subtract(early);
- memberWalletCoinDao.updateBlockBalance(memberId, newBalance, balance, 0);
- insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.ETH.name(), null, balance);
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.ETH.name(), null, balance);
// 插入财务记录
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.ETH.name(), 1, 1);
- // TODO 钉钉消息, 短信提醒
+
+ ThreadPoolUtils.sendDingTalk(5);
+ MemberEntity member = memberDao.selectById(memberId);
+ if (StrUtil.isNotBlank(member.getPhone())) {
+ String amount = newBalance.toPlainString() + "ETH";
+ 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);
+ }
}
}
}
@@ -159,10 +199,17 @@
if (balance.compareTo(early) > 0) {
BigDecimal newBalance = balance.subtract(early);
- memberWalletCoinDao.updateBlockBalance(memberId, newBalance, balance, 0);
- insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "OMNI", balance);
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "OMNI", balance);
- // TODO 钉钉消息, 短信提醒
+ ThreadPoolUtils.sendDingTalk(5);
+ MemberEntity member = memberDao.selectById(memberId);
+ if (StrUtil.isNotBlank(member.getPhone())) {
+ String amount = newBalance.toPlainString() + "USDT-OMNI";
+ 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);
+ }
}
}
}
@@ -199,17 +246,164 @@
if (balance.compareTo(early) > 0) {
log.info("#btc同步:{}, {}, {}#", memberId, balance, early);
BigDecimal newBalance = balance.subtract(early);
- memberWalletCoinDao.updateBlockBalance(memberId, newBalance, balance, 0);
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
- insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.BTC.name(), null, balance);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.BTC.name(), null, balance);
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.BTC.name(), 1, 1);
- // TODO 钉钉提醒, 短信提醒
-
+ ThreadPoolUtils.sendDingTalk(5);
+ MemberEntity member = memberDao.selectById(memberId);
+ if (StrUtil.isNotBlank(member.getPhone())) {
+ String amount = newBalance.toPlainString() + "BTC";
+ 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 updateEos() {
+ // 获取上次读取的序号
+ int pos= 0;
+ //每次获取的条数
+ int offset = 10;
+
+ String eosSeq = redisUtils.getString(EOS_SEQ_KEY);
+ 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){
+ String to = eosResult.getTo();
+ Integer accountActionSeq = eosResult.getAccountActionSeq();
+ if(accountActionSeq>seq){
+ seq = accountActionSeq;
+ }
+ if(!EosService.ACCOUNT.equals(to)){
+ // 判断是否是收款
+ continue;
+ }
+ // 处理收款
+ String quantity = eosResult.getQuantity();
+ String memo = eosResult.getMemo();
+ if(StringUtils.isBlank(memo)){
+ // 没有标记的跳过
+ continue;
+ }
+ 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)){
+ 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);
+ // 添加冲币记录
+ String orderNo = insertCoinCharge(EosService.ACCOUNT,memberId,amount,CoinTypeEnum.EOS.name(),memo,BigDecimal.ZERO);
+ LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.EOS.name(), 1, 1);
+
+ ThreadPoolUtils.sendDingTalk(5);
+ MemberEntity member = memberDao.selectById(memberId);
+ if (StrUtil.isNotBlank(member.getPhone())) {
+ //String amountEos = amountStr + "EOS";
+ 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);
+ }
+ }
+ }
+ }
+ }
+ }
+ // 最后更新seq 即下次查询的起始位置 在本次最大的基础上加一
+ 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);
+ 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);
+ }
+ }
+ }
+
+ }
+ }
+
}
private String generateNo() {
@@ -220,7 +414,7 @@
return String.valueOf(timestamp).substring(2) + random;
}
- public void 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) {
MemberCoinChargeEntity memberCoinChargeEntity = new MemberCoinChargeEntity();
memberCoinChargeEntity.setAddress(address);
memberCoinChargeEntity.setMemberId(memberId);
@@ -229,7 +423,9 @@
memberCoinChargeEntity.setTag(tag);
memberCoinChargeEntity.setStatus(1);
memberCoinChargeEntity.setLastAmount(lastAmount);
- memberCoinChargeEntity.setOrderCode(generateNo());
+ String orderNo = generateNo();
+ memberCoinChargeEntity.setOrderCode(orderNo);
memberCoinChargeDao.insert(memberCoinChargeEntity);
+ return orderNo;
}
}
--
Gitblit v1.9.1