From 36c7c8b1fb398fbbec6951a68844a09ad0cc0e9c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 30 Jun 2025 23:58:55 +0800
Subject: [PATCH] 地址
---
src/main/java/project/web/api/RechargeBlockchainController.java | 6 +++++-
src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java | 13 ++++++++++++-
src/main/java/project/web/api/UserWalletAddressController.java | 2 +-
src/main/java/project/blockchain/RechargeBlockchainService.java | 2 ++
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/project/blockchain/RechargeBlockchainService.java b/src/main/java/project/blockchain/RechargeBlockchainService.java
index 91efa43..db0c399 100644
--- a/src/main/java/project/blockchain/RechargeBlockchainService.java
+++ b/src/main/java/project/blockchain/RechargeBlockchainService.java
@@ -46,4 +46,6 @@
public boolean saveReject(RechargeBlockchain recharge);
void callback(String timestamp, String nonce, String sign, String body);
+
+ List<RechargeBlockchain> getByAddressUndone(String channelAddress);
}
diff --git a/src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java b/src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java
index 02a1eb1..66524fd 100644
--- a/src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java
+++ b/src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java
@@ -379,7 +379,7 @@
* 根据区块地址获取充值订单
*/
public RechargeBlockchain getAddress(String address) {
- List<RechargeBlockchain> list = jdbcTemplate.query("SELECT * FROM T_RECHARGE_BLOCKCHAIN_ORDER WHERE CHANNEL_ADDRESS=?", RecordObjectMapper.newInstance(RechargeBlockchain.class), address);
+ List<RechargeBlockchain> list = jdbcTemplate.query("SELECT * FROM T_RECHARGE_BLOCKCHAIN_ORDER WHERE succeeded = 0 and CHANNEL_ADDRESS=?", RecordObjectMapper.newInstance(RechargeBlockchain.class), address);
if (null != list && list.size() > 0) {
return list.get(0);
}
@@ -849,6 +849,17 @@
}
}
+ @Override
+ public List<RechargeBlockchain> getByAddressUndone(String channelAddress) {
+ return getUndone(channelAddress);
+ }
+ public List<RechargeBlockchain> getUndone(String channelAddress){
+ List<RechargeBlockchain> list = jdbcTemplate.query("SELECT * FROM T_RECHARGE_BLOCKCHAIN_ORDER WHERE succeeded = 0 and CHANNEL_ADDRESS=?", RecordObjectMapper.newInstance(RechargeBlockchain.class), channelAddress);
+ return list;
+ }
+
+
+
public void insertRechargeBlockchain(RechargeBlockchain rechargeBlockchain) {
Object[] jdbcParams = ApplicationUtil.getInsertStatement(rechargeBlockchain);
String insertUserSql = (String)jdbcParams[0];
diff --git a/src/main/java/project/web/api/RechargeBlockchainController.java b/src/main/java/project/web/api/RechargeBlockchainController.java
index daadd98..92ad611 100644
--- a/src/main/java/project/web/api/RechargeBlockchainController.java
+++ b/src/main/java/project/web/api/RechargeBlockchainController.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletRequest;
+import cn.hutool.core.collection.CollectionUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -144,7 +145,10 @@
}
}
}
-
+ List<RechargeBlockchain> rechargeBlockchainList = rechargeBlockchainService.getByAddressUndone( channel_address);
+ if(CollectionUtil.isNotEmpty(rechargeBlockchainList)){
+ throw new BusinessException("Please wait until the previous recharge is completed！");
+ }
//存储充值申请订单记录
RechargeBlockchain recharge = new RechargeBlockchain();
recharge.setAddress(from);
diff --git a/src/main/java/project/web/api/UserWalletAddressController.java b/src/main/java/project/web/api/UserWalletAddressController.java
index e49d6ab..7c13bdd 100644
--- a/src/main/java/project/web/api/UserWalletAddressController.java
+++ b/src/main/java/project/web/api/UserWalletAddressController.java
@@ -65,7 +65,7 @@
private final String gateway = "https://sig11.udun.io";
private final String merchantKey = "7fd79e4ed59e7c31e1fa2e13d64f7e6c";
private final String merchantId = "319563";
- private final String defaultCallBackUrl = "https://coin.usadeepcoin.com/wap/api/user!rechargeCallback.action";
+ private final String defaultCallBackUrl = "https://eu.deepcoineu.com/wap/api/user!rechargeCallback.action";
--
Gitblit v1.9.3