From 1699f3441bcae0066c8cf99d7760239569e219db Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 26 Sep 2025 18:45:18 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java
index 8a47e84..c875e1a 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java
@@ -376,9 +376,9 @@
                 .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
         money = wallet.getMoney().doubleValue();
         // 钱包USDT
-        money_wallet = wallet.getMoney().doubleValue();
+        money_wallet = wallet.getMoney().doubleValue()+wallet.getFreezeMoney().doubleValue();
         // 币余额
-        money_coin = this.getMoneyCoin(partyId, realtime_all, list_symbol)+capitaltWallet.getMoney().doubleValue();
+        money_coin = this.getMoneyCoin(partyId, realtime_all, list_symbol)+capitaltWallet.getMoney().doubleValue()+capitaltWallet.getFreezeMoney().doubleValue();
         money = money + money_coin;
         // 钱包USDT+币余额
         money_all_coin = money;
@@ -857,7 +857,7 @@
                     }
 
                     if (realtime != null) {
-                        money_coin = Arith.add(money_coin, Arith.mul(realtime.getClose().doubleValue(), walletExtend.getAmount()));
+                        money_coin = Arith.add(money_coin, Arith.mul(realtime.getClose().doubleValue(), walletExtend.getAmount()+walletExtend.getFreezeAmount()));
                     }
                 }
             }

--
Gitblit v1.9.3