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-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 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 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){

--
Gitblit v1.9.3