From 11fd59b73e1f6a69d28ef1513ca94903f22d076a Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 11 Oct 2025 16:45:42 +0800
Subject: [PATCH] 1
---
trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java | 2 ++
trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java | 5 +++--
trading-order-admin/src/main/resources/config/system.properties | 3 ++-
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 32 ++++++++++++++++++++++++++------
4 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java b/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
index ec7e7b4..8bb281a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
@@ -4,6 +4,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpStatus;
import cn.hutool.json.JSONUtil;
+import com.yami.trading.common.constants.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -35,12 +36,12 @@
/**
* Callback 充值
*/
- private final String defaultCallBackUrl = "https://api.stakecube-pro.com/api/channelBlockchain!rechargeCallback.action";
+ private final String defaultCallBackUrl = Constants.API_HTTP + "api/channelBlockchain!rechargeCallback.action";
/**
* Callback 提币
*/
- private final String withdrawCallBackUrl = "https://api.stakecube-pro.com/api/withdraw/withdrawCallback.action";
+ private final String withdrawCallBackUrl = Constants.API_HTTP + "api/withdraw/withdrawCallback.action";
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
index 674cedc..627d379 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
@@ -225,6 +225,13 @@
rechargeAddressVo.setAuto(false);
rechargeAddressVo.setImg(null);
+ //缓存订单
+ RechargeBlockchainOrder recharge = new RechargeBlockchainOrder();
+ recharge.setBlockchainName(currencyEnum.getChain());
+ recharge.setSymbol(currencyEnum.getCoin());
+ recharge.setPartyId(partyId);
+ redisTemplate.opsForValue().set(rechargeAddressVo.getAddress(), recharge);
+
data.add(rechargeAddressVo);
}
});
@@ -261,22 +268,35 @@
double decimals = Double.parseDouble(map.get("decimals").toString());
double success_amount = amounts / Math.pow(10, decimals);
String address = map.get("address").toString();
-
+ Integer status = Integer.valueOf(map.get("status").toString());
RechargeBlockchainOrder blockchainOrder = rechargeBlockchainOrderService.getOne(new LambdaQueryWrapper<>(RechargeBlockchainOrder.class)
.eq(RechargeBlockchainOrder::getSucceeded, 0)
.eq(RechargeBlockchainOrder::getChannelAddress, address).last(" limit 1 "));
if(ObjectUtil.isEmpty(blockchainOrder)){
- resultMsg.setCode(200);
- return resultMsg;
+ //查询地址订单
+ blockchainOrder = (RechargeBlockchainOrder)redisTemplate.opsForValue().get(address);
+ log.info("===rechargeCallback===blockchainOrder：{}", blockchainOrder);
+ if (blockchainOrder == null){
+ resultMsg.setCode(200);
+ return resultMsg;
+ }
+ if (status == 3) { //成功新增订单
+ blockchainOrder.setAddress(null);
+ blockchainOrder.setVolume(success_amount);
+ blockchainOrder.setImg(null);
+ blockchainOrder.setSucceeded(0);
+ blockchainOrder.setChannelAddress(address);
+ blockchainOrder.setTx("");
+ rechargeBlockchainOrderService.saveOrder(blockchainOrder);
+ }
}
- Integer status = Integer.valueOf(map.get("status").toString());
- SysUser user = sysUserService.getSysUserById( Long.getLong(blockchainOrder.getPartyId()));
+ SysUser user = sysUserService.getSysUserById(Long.getLong(blockchainOrder.getPartyId()));
+
if (status == 3) { //交易成功
rechargeBlockchainOrderService.manualReceipt(1,blockchainOrder.getPartyId(), BigDecimal.valueOf(success_amount),user.getUsername());
} else if(status == 2) { //驳回
rechargeBlockchainOrderService.refusalApply(blockchainOrder.getUuid(), "订单失败：" + status, user.getUsername());
}
-
resultMsg.setCode(200);
return resultMsg;
}catch (Exception e){
diff --git a/trading-order-admin/src/main/resources/config/system.properties b/trading-order-admin/src/main/resources/config/system.properties
index f94d288..6ec2926 100644
--- a/trading-order-admin/src/main/resources/config/system.properties
+++ b/trading-order-admin/src/main/resources/config/system.properties
@@ -3,10 +3,11 @@
admin_url=https://127.0.0.1:8080/admin
web_url=http://127.0.0.1:8080/wap/
-images_http=https://img.stokrpro.com/
+images_http=https://img.metaequityex.com/
loca.images.dir=/www/wwwroot/img
admin_rest_url=https://enjdhdg.site/api
+api_http=https://api.metaequityex.com/
#email.host=smtp.gmail.com
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java b/trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java
index c5fab7b..bbc890a 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java
@@ -15,6 +15,8 @@
public static final String IMAGES_HTTP = PropertiesUtil.getProperty("images_http");
+ public static final String API_HTTP = PropertiesUtil.getProperty("api_http");
+
/**
* c2c卖币
*/
--
Gitblit v1.9.3