From 2cfba883471ec6dabd94ae07e5f7df5dc9df6912 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 14 Oct 2025 20:23:19 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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..9818873 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
@@ -281,10 +281,11 @@
             walletExtendMoneyRef.updateAndGet(current -> current.add(money));
         });
         BigDecimal walletExtendMoney = walletExtendMoneyRef.get();
-        CapitaltWallet userIdWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<CapitaltWallet>()
-                .eq(CapitaltWallet::getUserId,partyId.toString()));
+//        CapitaltWallet userIdWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<CapitaltWallet>()
+//                .eq(CapitaltWallet::getUserId,partyId.toString()));
         moneys_contract.put("money_wallet", wallet.getMoney().doubleValue());//可用余额
-        moneys_contract.put("money_contract", userIdWallet.getMoney().doubleValue()+wallet.getMoney().doubleValue()+money_contract+walletExtendMoney.doubleValue());
+//        moneys_contract.put("money_contract", userIdWallet.getMoney().doubleValue()+wallet.getMoney().doubleValue()+money_contract+walletExtendMoney.doubleValue());
+        moneys_contract.put("money_contract", wallet.getMoney().doubleValue()+money_contract+walletExtendMoney.doubleValue());
         return moneys_contract;
     }
 
@@ -372,13 +373,13 @@
             wallet = saveWalletByPartyId(partyId.toString());
         }
         //资金账户
-        CapitaltWallet capitaltWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
-                .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
+//        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)+capitaltWallet.getMoney().doubleValue();
+        money_coin = this.getMoneyCoin(partyId, realtime_all, list_symbol);
         money = money + money_coin;
         // 钱包USDT+币余额
         money_all_coin = money;

--
Gitblit v1.9.3