From 7295334ff00457c111484d2f021a9c33bbf4a5f2 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sun, 04 Jan 2026 16:50:46 +0800
Subject: [PATCH] 充值
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java
index b9a9916..0f8822d 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java
@@ -290,6 +290,7 @@
walletExtend.setAmount(Double.valueOf(df2.format(walletExtend.getAmount())));
walletExtend.setLockAmount(Double.valueOf(df2.format(walletExtend.getLockAmount())));
walletExtend.setFreezeAmount(Double.valueOf(df2.format(walletExtend.getFreezeAmount())));
+ walletExtend.setName(itemMap.get(list_symbol.get(i)).getName());
walletExtendsRet.add(walletExtend);
temp = 1;
}
@@ -375,7 +376,31 @@
mapUsdt.put("frozenAmount", 0);
extendsList.add(0, mapUsdt);
}
- mapRet.put("extends", extendsList);
+
+ // 分离 USDC 和 USDT，并保留其他数据
+ Map<String, Object> usdcEntry = null;
+ Map<String, Object> usdtEntry = null;
+ List<Map<String, Object>> otherEntries = new ArrayList<>();
+
+ for (Map<String, Object> entry : extendsList) {
+ String symbolData = (String) entry.get("symbol_data");
+ if ("usdc".equals(symbolData)) {
+ usdcEntry = entry;
+ } else if ("usdt".equals(symbolData)) {
+ usdtEntry = entry;
+ } else {
+ otherEntries.add(entry);
+ }
+ }
+
+ // 重新组合，USDC 第一，USDT 第二，其他保持原顺序
+ List<Map<String, Object>> newExtendsList = new ArrayList<>();
+ if (usdcEntry != null) newExtendsList.add(usdcEntry);
+ if (usdtEntry != null) newExtendsList.add(usdtEntry);
+ newExtendsList.addAll(otherEntries);
+
+ mapRet.put("extends", newExtendsList);
+
return Result.succeed(mapRet);
}
--
Gitblit v1.9.3