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 | 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 b06ca1d..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
@@ -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_wallet = wallet.getMoney().doubleValue()+wallet.getFreezeMoney().doubleValue();
// 币余额
- money_coin = this.getMoneyCoin(partyId, realtime_all, list_symbol);
+ money_coin = this.getMoneyCoin(partyId, realtime_all, list_symbol)+capitaltWallet.getMoney().doubleValue()+capitaltWallet.getFreezeMoney().doubleValue();
money = money + money_coin;
// 钱包USDT+币余额
money_all_coin = money;
@@ -456,7 +457,7 @@
data.put("money_all_coin", df2.format(money_all_coin));
data.put("money_miner", df2.format(money_miner));
data.put("money_finance", df2.format(money_finance));
- data.put("money_contract", df2.format(Arith.add(money_contract, money_contractApply)));
+ data.put("money_contract", df2.format(Arith.add(money_contract_deposit, money_contractApply)));
data.put("money_contract_deposit", df2.format(money_contract_deposit));
data.put("money_contract_profit", df2.format(money_contract_profit));
data.put("money_futures", df2.format(money_futures));
@@ -856,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