From b15a73415933c2cdbaa0cfc15711bb682e77e3a3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 21 Oct 2020 20:25:43 +0800
Subject: [PATCH] 修改接点配置,添加充值hash校验

---
 src/main/java/com/xcong/excoin/modules/blackchain/service/EthService.java             |    4 ++--
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java     |    1 -
 src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java |    3 +--
 src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java    |    8 ++++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/EthService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/EthService.java
index a147679..37b54ef 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/EthService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/EthService.java
@@ -54,8 +54,8 @@
 	/**
 	 * 服务器地址
 	 */
-	//private static final String ETH_UTL = "https://mainnet.infura.io/v3/882c66ebcfc141abbea22b948fa44321";
-	private static final String ETH_UTL = "http://120.55.86.146:8545";
+	//private static final String ETH_UTL = "http://120.55.86.146:8545";
+	private static final String ETH_UTL = "http://114.55.250.231:8545";
 
 	public EthService() {
 		try {
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java
index b509a69..7987897 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java
@@ -62,8 +62,7 @@
         return Web3j.build(httpService);
     }
 
-    private static String blockchainNode = "http://120.55.86.146:8545";
-    //private static String blockchainNode = "http://47.75.209.83:10098";
+    private static String blockchainNode = "http://114.55.250.231:8545";
 
     private static String contractAddr = "0xdac17f958d2ee523a2206206994597c13d831ec7";
 
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 b719e38..38124ff 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
@@ -553,6 +553,13 @@
         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;
@@ -614,4 +621,5 @@
         memberCoinChargeDao.insert(memberCoinChargeEntity);
         return orderNo;
     }
+
 }
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 247c439..4a7a6ed 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -472,7 +472,6 @@
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
         MemberEntity memberEntity = memberDao.selectById(memberId);
 
-
         String code = memberForgetPwdDto.getCode();
         String password = memberForgetPwdDto.getPassword();
         String account = memberForgetPwdDto.getAccount();

--
Gitblit v1.9.1