From a9d18fe810001b735d68f352a28abf48d6c04bf3 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 17 Oct 2025 17:21:38 +0800
Subject: [PATCH] U盾充值

---
 trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 cf9391b..ea19b96 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
@@ -10,6 +10,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yami.trading.bean.vo.RechargeAddressVo;
+import com.yami.trading.common.constants.RedisKeys;
 import com.yami.trading.security.common.enums.CryptoCurrencyEnum;
 import com.yami.trading.security.common.util.LocalKeyStorageAESUtil;
 import com.yami.trading.api.UD.*;
@@ -213,13 +214,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());
@@ -270,11 +271,13 @@
                 return resultMsg;
             }
             Integer status = Integer.valueOf(map.get("status").toString());
-            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.getPartyId(), BigDecimal.valueOf(success_amount),user.getUsername());
+                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);

--
Gitblit v1.9.3