From 1b0e20f11a920ba8c0c38e4c8fef58e8fa1fe0d2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Jul 2020 19:41:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java | 125 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 116 insertions(+), 9 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 1e02af0..c8bb4ce 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,9 +1,13 @@
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.coin.service.BlockCoinService;
import com.xcong.excoin.modules.member.dao.MemberCoinAddressDao;
import com.xcong.excoin.modules.member.dao.MemberCoinChargeDao;
@@ -14,6 +18,9 @@
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.ThreadPoolUtils;
+import com.xcong.excoin.utils.dingtalk.DingTalkUtils;
+import com.xcong.excoin.utils.mail.Sms106Send;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,6 +28,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.Date;
import java.util.List;
/**
@@ -50,7 +58,7 @@
String address = addressEntity.getAddress();
Long memberId = addressEntity.getMemberId();
- if (StrUtil.isNotBlank(address)) {
+ if (StrUtil.isBlank(address)) {
continue;
}
@@ -74,16 +82,25 @@
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);
+ }
}
}
}
}
}
+ @Transactional(rollbackFor = Exception.class)
@Override
public void updateEth() {
List<MemberCoinAddressEntity> list = memberCoinAddressDao.selectAllBlockAddressBySymbol(CoinTypeEnum.ETH.name());
@@ -114,26 +131,114 @@
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);
+ }
}
}
}
}
}
+ @Transactional(rollbackFor = Exception.class)
@Override
public void updateBtcUsdt() {
+ List<MemberCoinAddressEntity> list = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "OMNI");
+ if (CollUtil.isNotEmpty(list)) {
+ UsdtService usdtService = UsdtService.getInstance();
+ for (MemberCoinAddressEntity coinAddressEntity : list) {
+ String address = coinAddressEntity.getAddress();
+ Long memberId = coinAddressEntity.getMemberId();
+
+ BigDecimal balance = usdtService.getBalance(address);
+ if (balance != null && balance.compareTo(new BigDecimal("0.1")) > 0) {
+ MemberCoinChargeEntity memberCoinChargeEntity = memberCoinChargeDao.selectNewestChargeRecord(memberId, CoinTypeEnum.USDT.name(), "OMNI");
+ BigDecimal early = BigDecimal.ZERO;
+ if (memberCoinChargeEntity != null) {
+ BigDecimal lastAmount = memberCoinChargeEntity.getLastAmount();
+ if (lastAmount != null) {
+ early = lastAmount;
+ }
+ }
+
+ MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
+ if (walletCoin == null) {
+ continue;
+ }
+
+ if (balance.compareTo(early) > 0) {
+ BigDecimal newBalance = balance.subtract(early);
+
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "OMNI", balance);
+
+ 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);
+ }
+ }
+ }
+ }
+ }
}
+ @Transactional(rollbackFor = Exception.class)
@Override
public void updateBtc() {
+ List<MemberCoinAddressEntity> list = memberCoinAddressDao.selectAllBlockAddressBySymbol(CoinTypeEnum.BTC.name());
+ if (CollUtil.isNotEmpty(list)) {
+ BtcService btcService = BtcService.getInstance();
+ for (MemberCoinAddressEntity coinAddressEntity : list) {
+ String address = coinAddressEntity.getAddress();
+ Long memberId = coinAddressEntity.getMemberId();
+ BigDecimal balance = btcService.getBalance(address);
+
+ if (balance != null && balance.compareTo(new BigDecimal("0.00012")) > 0) {
+ MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.BTC.name());
+ if (walletCoin == null) {
+ continue;
+ }
+
+ BigDecimal early = BigDecimal.ZERO;
+ MemberCoinChargeEntity coinCharge = memberCoinChargeDao.selectNewestChargeRecord(memberId, CoinTypeEnum.BTC.name(), null);
+ if (coinCharge != null) {
+ BigDecimal lastAmount = coinCharge.getLastAmount();
+ if (lastAmount != null) {
+ early = lastAmount;
+ }
+ }
+
+ if (balance.compareTo(early) > 0) {
+ log.info("#btc同步:{}, {}, {}#", memberId, balance, early);
+ BigDecimal newBalance = balance.subtract(early);
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
+
+ String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.BTC.name(), null, balance);
+ LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.BTC.name(), 1, 1);
+
+ 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);
+ }
+ }
+ }
+ }
+ }
}
private String generateNo() {
@@ -144,7 +249,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);
@@ -153,7 +258,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