From 14c1946eae86a86f8d1edee6cf3bdaf7572fc966 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 30 Oct 2025 19:44:38 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 658d71a..525a46a 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
@@ -7,6 +7,7 @@
import com.yami.trading.api.service.UserCacheService;
import com.yami.trading.bean.data.domain.Realtime;
import com.yami.trading.bean.item.domain.Item;
+import com.yami.trading.bean.model.CapitaltWallet;
import com.yami.trading.bean.model.ChannelBlockchain;
import com.yami.trading.bean.model.Wallet;
import com.yami.trading.bean.model.WalletExtend;
@@ -18,10 +19,7 @@
import com.yami.trading.common.util.HttpContextUtils;
import com.yami.trading.common.util.StringUtils;
import com.yami.trading.security.common.util.SecurityUtils;
-import com.yami.trading.service.ChannelBlockchainService;
-import com.yami.trading.service.RechargeBlockchainOrderService;
-import com.yami.trading.service.WalletService;
-import com.yami.trading.service.WithdrawService;
+import com.yami.trading.service.*;
import com.yami.trading.service.data.DataService;
import com.yami.trading.service.item.ItemService;
import com.yami.trading.service.syspara.SysparaService;
@@ -71,6 +69,8 @@
ItemService itemService;
@Autowired
WalletLogService walletLogService;
+ @Autowired
+ CapitaltWalletService capitaltWalletService;
@GetMapping("/getUsdt")
@ApiOperation(value = "获取usdt余额")
@@ -218,6 +218,7 @@
Wallet usdt = null;
if (StringUtils.isNotEmpty(partyId)) {
usdt = this.walletService.saveWalletByPartyId(partyId);
+// usdt = capitaltWalletService.getUserIdWallet(partyId);
}
if (null == usdt) {
usdt = new Wallet();
@@ -286,7 +287,7 @@
for (int j = 0; j < walletExtends.size(); j++) {
WalletExtend walletExtend = walletExtends.get(j);
if (walletExtend.getWallettype().equals(list_symbol.get(i))) {
- walletExtend.setAmount(Double.valueOf(df2.format(walletExtend.getAmount())));
+ walletExtend.setAmount(Double.valueOf(df2.format(walletExtend.getAmount()-walletExtend.getFreezeAmount())));
walletExtend.setLockAmount(Double.valueOf(df2.format(walletExtend.getLockAmount())));
walletExtend.setFreezeAmount(Double.valueOf(df2.format(walletExtend.getFreezeAmount())));
walletExtendsRet.add(walletExtend);
@@ -374,7 +375,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