From 6bf0b7c668f615b71c23c1bb720fe0f80ec05092 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 05 Mar 2026 10:36:04 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiFuturesOrderController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiFuturesOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiFuturesOrderController.java
index 6e112ea..04fb253 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiFuturesOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiFuturesOrderController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yami.trading.api.dto.FutureOpenAction;
@@ -9,6 +10,7 @@
import com.yami.trading.bean.future.domain.FuturesOrder;
import com.yami.trading.bean.future.domain.FuturesPara;
import com.yami.trading.bean.item.domain.Item;
+import com.yami.trading.bean.model.CapitaltWallet;
import com.yami.trading.bean.model.User;
import com.yami.trading.bean.model.Wallet;
import com.yami.trading.common.domain.Result;
@@ -19,6 +21,7 @@
import com.yami.trading.common.util.ThreadUtils;
import com.yami.trading.security.common.util.SecurityUtils;
import com.yami.trading.common.util.*;
+import com.yami.trading.service.CapitaltWalletService;
import com.yami.trading.service.SessionTokenService;
import com.yami.trading.service.WalletService;
import com.yami.trading.service.future.FuturesOrderService;
@@ -57,6 +60,8 @@
private FuturesOrderService futuresOrderService;
@Autowired
private FuturesParaService futuresParaService;
+ @Autowired
+ CapitaltWalletService capitaltWalletService;
/**
* 开仓页面参数
* <p>
@@ -106,12 +111,17 @@
String partyId = SecurityUtils.getCurrentUserId();
if (StrUtil.isNotBlank(partyId) && futuresParas != null) {
Wallet wallet = this.walletService.findByUserId(partyId);
+ // 获取资金账户（capital）
+ CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+ .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
// 账户剩余资金
String session_token = this.sessionTokenService.savePut(partyId);
data.put("session_token", session_token);
data.put("amount", wallet.getMoney().longValue());
+ data.put("capitaltAmount", capitaltWallet.getMoney().longValue());
} else {
data.put("amount", 0);
+ data.put("capitaltAmount", 0);
}
data.put("open", MarketOpenChecker.isMarketOpenByItemCloseType(bySymbol.getOpenCloseType()));
return Result.succeed(data);
--
Gitblit v1.9.3