From 5bfeca1cc5b5263e17c068ca12fbaab1d51917f4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 22 Oct 2025 13:37:35 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java | 14 ++++++++------
1 files changed, 8 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..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
@@ -84,7 +84,6 @@
WalletExtendService walletExtendService;
-
@Override
public Wallet findByUserId(String userId) {
Wallet wallet = getOne(Wrappers.<Wallet>query().lambda().eq(Wallet::getUserId, userId));
@@ -282,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,7 +372,9 @@
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();
@@ -456,7 +458,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));
--
Gitblit v1.9.3