From f8b60aa772e7d79de55a643c655ed40c5a5dd391 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 11 Nov 2025 10:32:40 +0800
Subject: [PATCH] 精度
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 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 fad574e..575d484 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
@@ -160,21 +160,31 @@
blockchain1.setImg(null);
data.add(blockchain1);
}else if(coin.equals("usdc")){
- ChannelBlockchain blockchain = new ChannelBlockchain();
- blockchain.setBlockchain_name("ERC20(1)");
- blockchain.setAddress(loadedMap.get("usdcErc1").asText());
- blockchain.setCoin(coin);
- blockchain.setAuto(false);
- blockchain.setImg(null);
- data.add(blockchain);
+ if(org.apache.commons.lang3.StringUtils.isNoneBlank(loadedMap.get("usdcErc2").asText())){
+ ChannelBlockchain blockchain = new ChannelBlockchain();
+ blockchain.setBlockchain_name("ERC20(1)");
+ blockchain.setAddress(loadedMap.get("usdcErc1").asText());
+ blockchain.setCoin(coin);
+ blockchain.setAuto(false);
+ blockchain.setImg(null);
+ data.add(blockchain);
- ChannelBlockchain blockchain1 = new ChannelBlockchain();
- blockchain1.setBlockchain_name("ERC20(2)");
- blockchain1.setAddress(loadedMap.get("usdcErc2").asText());
- blockchain1.setCoin(coin);
- blockchain1.setAuto(false);
- blockchain1.setImg(null);
- data.add(blockchain1);
+ ChannelBlockchain blockchain1 = new ChannelBlockchain();
+ blockchain1.setBlockchain_name("ERC20(2)");
+ blockchain1.setAddress(loadedMap.get("usdcErc2").asText());
+ blockchain1.setCoin(coin);
+ blockchain1.setAuto(false);
+ blockchain1.setImg(null);
+ data.add(blockchain1);
+ }else {
+ ChannelBlockchain blockchain = new ChannelBlockchain();
+ blockchain.setBlockchain_name("ERC20");
+ blockchain.setAddress(loadedMap.get("usdcErc1").asText());
+ blockchain.setCoin(coin);
+ blockchain.setAuto(false);
+ blockchain.setImg(null);
+ data.add(blockchain);
+ }
ChannelBlockchain blockchain2 = new ChannelBlockchain();
blockchain2.setBlockchain_name("TRC20");
@@ -291,17 +301,19 @@
blockchainOrder.setChannelAddress(address);
blockchainOrder.setTx("");
rechargeBlockchainOrderService.saveOrder(blockchainOrder);
- SysUser user = sysUserService.getSysUserById(Long.getLong(blockchainOrder.getPartyId()));
+ User user = userService.getById(blockchainOrder.getPartyId());
log.info("===rechargeCallback==d=blockchainOrder：{}", blockchainOrder);
if (status == 3) { //交易成功
- rechargeBlockchainOrderService.manualReceipt(1,blockchainOrder.getOrderNo(), BigDecimal.valueOf(success_amount),user.getUsername());
+ log.info("===rechargeCallback==manualReceipt{}", blockchainOrder.getOrderNo());
+ rechargeBlockchainOrderService.manualReceipt(1,blockchainOrder.getOrderNo(), BigDecimal.valueOf(success_amount),user.getUserName());
} else if(status == 2) { //驳回
- rechargeBlockchainOrderService.refusalApply(blockchainOrder.getUuid(), "订单失败：" + status, user.getUsername());
+ rechargeBlockchainOrderService.refusalApply(blockchainOrder.getUuid(), "订单失败：" + status, user.getUserName());
}
resultMsg.setCode(200);
return resultMsg;
}catch (Exception e){
+ e.printStackTrace();
resultMsg.setCode(500);
resultMsg.setMessage("回调处理失败");
return resultMsg;
--
Gitblit v1.9.3