From dd9c1b76710c9c413026aafe1ad6ed232c51d02f Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 13 Oct 2025 14:05:36 +0800
Subject: [PATCH] 充值
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 15 +++++++++------
1 files changed, 9 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 3066198..85cb394 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
@@ -11,6 +11,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yami.trading.bean.vo.RechargeAddressVo;
+import com.yami.trading.common.constants.RedisKeys;
import com.yami.trading.huobi.hobi.http.HttpHelper;
import com.yami.trading.security.common.enums.CryptoCurrencyEnum;
import com.yami.trading.security.common.util.LocalKeyStorageAESUtil;
@@ -211,13 +212,13 @@
ChannelBlockchain rechargeAddressVo = new ChannelBlockchain();
//创建地址
Address address;
- String ress = (String)redisTemplate.opsForValue().get(partyId + coinName);
+ String ress = (String)redisTemplate.opsForValue().get(RedisKeys.BLOCKCHAIN_ADDRESS + partyId + coinName);
if(StringUtils.isNotEmpty(ress)){
rechargeAddressVo.setAddress(ress);
}else{
address = udunClient.createAddress(c.getMainCoinType());
rechargeAddressVo.setAddress(address.getAddress());
- redisTemplate.opsForValue().set(partyId + coinName, address.getAddress());
+ redisTemplate.opsForValue().set(RedisKeys.BLOCKCHAIN_ADDRESS + partyId + coinName, address.getAddress());
}
//rechargeAddressVo.setAddress("test" + coinName);
rechargeAddressVo.setCoin(currencyEnum.getCoin());
@@ -228,7 +229,7 @@
//缓存订单
RechargeBlockchainOrder recharge = new RechargeBlockchainOrder();
recharge.setBlockchainName(currencyEnum.getChain());
- recharge.setSymbol(currencyEnum.getCoin());
+ recharge.setSymbol(currencyEnum.getSymbol());
recharge.setPartyId(partyId);
redisTemplate.opsForValue().set(rechargeAddressVo.getAddress(), recharge);
@@ -290,17 +291,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