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/blockchain/internal/RechargeBlockchainServiceImpl.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java b/src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java
index 790a5a4..66524fd 100644
--- a/src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java
+++ b/src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java
@@ -126,15 +126,6 @@
 	@Override
 	public void save_api(RechargeBlockchain recharge) {
 
-		if (!"ETH".equals(recharge.getSymbol().toUpperCase())) {
-			ChannelBlockchain channel = channelBlockchainService.findByNameAndCoinAndAdd(recharge.getBlockchain_name(),
-					recharge.getSymbol(), recharge.getChannel_address());
-
-			if (channel == null || !recharge.getSymbol().toUpperCase().equals(channel.getCoin())) {
-				throw new BusinessException("充值链错误");
-			}
-		}
-
 		double recharge_limit_min = Double.valueOf(sysparaService.find("recharge_limit_min").getValue());
 		double recharge_limit_max = Double.valueOf(sysparaService.find("recharge_limit_max").getValue());
 		if ("usdt".equals(recharge.getSymbol())) {
@@ -388,7 +379,7 @@
 	 * 根据区块地址获取充值订单
 	 */
 	public RechargeBlockchain getAddress(String address) {
-		List<RechargeBlockchain> list = jdbcTemplate.query("SELECT * FROM T_RECHARGE_BLOCKCHAIN_ORDER WHERE blockchain_name=?", 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);
 		}
@@ -664,7 +655,7 @@
 		try {
 			ObjectMapper objectMapper = new ObjectMapper();
 			Map<String, Object> map = objectMapper.readValue(body, HashMap.class);
-			double amounts = Double.parseDouble(map.get("fee").toString());  // 假设 amount 的值为 1000
+			double amounts = Double.parseDouble(map.get("amount").toString());  // 假设 amount 的值为 1000
 			double decimals = Double.parseDouble(map.get("decimals").toString());
 			double success_amount  = amounts / Math.pow(10, decimals);
 			RechargeBlockchain recharge = this.getAddress(map.get("address").toString());
@@ -858,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];

--
Gitblit v1.9.3