From 81cfec3a4f79e98fd6ae727e0f27aa443c89169a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Sep 2025 19:06:14 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java |    7 ++++---
 1 files changed, 4 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 640e647..8a47e84 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
@@ -84,7 +84,6 @@
     WalletExtendService walletExtendService;
 
 
-
     @Override
     public Wallet findByUserId(String userId) {
         Wallet wallet = getOne(Wrappers.<Wallet>query().lambda().eq(Wallet::getUserId, userId));
@@ -372,12 +371,14 @@
         if (!"".equals(partyId) && partyId != null) {
             wallet = saveWalletByPartyId(partyId.toString());
         }
-
+        //资金账户
+        CapitaltWallet capitaltWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+                .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
         money = wallet.getMoney().doubleValue();
         // 钱包USDT
         money_wallet = wallet.getMoney().doubleValue();
         // 币余额
-        money_coin = this.getMoneyCoin(partyId, realtime_all, list_symbol);
+        money_coin = this.getMoneyCoin(partyId, realtime_all, list_symbol)+capitaltWallet.getMoney().doubleValue();
         money = money + money_coin;
         // 钱包USDT+币余额
         money_all_coin = money;

--
Gitblit v1.9.3