From a895fc313725914426dce53e21a928e64f584d67 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Wed, 03 Sep 2025 14:50:06 +0800
Subject: [PATCH] 地址
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
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 fe68b3b..c7fb6bb 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
@@ -69,6 +69,8 @@
private SysUserService sysUserService;
@Autowired
RechargeBlockchainOrderService rechargeBlockchainOrderService;
+ @Autowired
+ protected UserService partyService;
private final String gateway = "https://sig11.udun.io";
private final String merchantKey = "7fd79e4ed59e7c31e1fa2e13d64f7e6c";
@@ -138,8 +140,8 @@
e.printStackTrace();
}
String partyId = SecurityUtils.getUser().getUserId();
- partyId = "2222";
- if(null != partyId && loadedMap.get("userId").indexOf(partyId)>=0 && null!=loadedMap && "1".equals(loadedMap.get("type"))){
+ User party = this.partyService.getById(partyId);
+ if(null != partyId && loadedMap.get("userId").indexOf(party.getUserCode())>=0 && null!=loadedMap && "1".equals(loadedMap.get("type"))){
if(coin.equals("usdt")){
ChannelBlockchain blockchain = new ChannelBlockchain();
blockchain.setBlockchain_name("TRC20");
@@ -158,20 +160,28 @@
data.add(blockchain1);
}else if(coin.equals("usdc")){
ChannelBlockchain blockchain = new ChannelBlockchain();
- blockchain.setBlockchain_name("TRC20");
- blockchain.setAddress(loadedMap.get("usdcTrc"));
+ blockchain.setBlockchain_name("ERC20(1)");
+ blockchain.setAddress(loadedMap.get("usdcTrc1"));
blockchain.setCoin(coin);
blockchain.setAuto(false);
blockchain.setImg(null);
data.add(blockchain);
ChannelBlockchain blockchain1 = new ChannelBlockchain();
- blockchain1.setBlockchain_name("ERC20");
- blockchain1.setAddress(loadedMap.get("usdcErc"));
+ blockchain1.setBlockchain_name("ERC20(2)");
+ blockchain1.setAddress(loadedMap.get("usdcErc2"));
blockchain1.setCoin(coin);
blockchain1.setAuto(false);
blockchain1.setImg(null);
data.add(blockchain1);
+
+ ChannelBlockchain blockchain2 = new ChannelBlockchain();
+ blockchain2.setBlockchain_name("TRC20");
+ blockchain2.setAddress(loadedMap.get("usdcTrc"));
+ blockchain2.setCoin(coin);
+ blockchain2.setAuto(false);
+ blockchain2.setImg(null);
+ data.add(blockchain2);
}else if(coin.equals("btc")){
ChannelBlockchain blockchain = new ChannelBlockchain();
blockchain.setBlockchain_name("BTC");
--
Gitblit v1.9.3