From d4be4cc69f18b01cc39bd3f9dc9497a828848ca8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 30 Sep 2025 11:18:44 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 55c0dea..b90503b 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
@@ -215,13 +215,13 @@
df2.setRoundingMode(RoundingMode.FLOOR);
// String partyId ="dcc0dd35a49c383dadabc4dc030afe70";
String partyId = SecurityUtils.getCurrentUserId();
- CapitaltWallet usdt = null;
+ Wallet usdt = null;
if (StringUtils.isNotEmpty(partyId)) {
-// usdt = this.walletService.saveWalletByPartyId(partyId);
- usdt = capitaltWalletService.getUserIdWallet(partyId);
+ usdt = this.walletService.saveWalletByPartyId(partyId);
+// usdt = capitaltWalletService.getUserIdWallet(partyId);
}
if (null == usdt) {
- usdt = new CapitaltWallet();
+ usdt = new Wallet();
usdt.setMoney(new BigDecimal(0));
usdt.setLockMoney(new BigDecimal(0));
usdt.setFreezeMoney(new BigDecimal(0));
@@ -287,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);
@@ -365,8 +365,8 @@
} else {
mapUsdt.put("lock_amount", null);
}
- if (mapRet.get("freeze_amount") != null) {
- mapUsdt.put("freeze_amount", df2.format(Double.parseDouble(mapRet.get("freeze_amount").toString())));
+ if (mapRet.get("freeze_money") != null) {
+ mapUsdt.put("freeze_amount", df2.format(Double.parseDouble(mapRet.get("freeze_money").toString())));
} else {
mapUsdt.put("freeze_amount", null);
}
--
Gitblit v1.9.3