From e70d64cf80e3526c3ec46ba8f97d9b6d95d9d851 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 24 Jun 2026 15:04:17 +0800
Subject: [PATCH] fix(okx): 修复本金计算逻辑和条件单取消功能
---
src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java b/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
index 6db2ab3..99fdd44 100644
--- a/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
@@ -133,11 +133,19 @@
public void init() {
try {
JSONObject account = executorGet("/api/v5/account/balance");
- JSONArray details = account.getJSONArray("data");
- if (details != null && !details.isEmpty()) {
- JSONObject total = details.getJSONObject(0);
- this.initialPrincipal = total.getBigDecimal("totalEq");
- log.info("[OKX] 初始本金: {} USDT", initialPrincipal);
+ JSONArray dataArr = account.getJSONArray("data");
+ if (dataArr != null && !dataArr.isEmpty()) {
+ JSONArray details = dataArr.getJSONObject(0).getJSONArray("details");
+ if (details != null) {
+ for (int i = 0; i < details.size(); i++) {
+ JSONObject currency = details.getJSONObject(i);
+ if ("USDT".equals(currency.getString("ccy"))) {
+ this.initialPrincipal = currency.getBigDecimal("eq");
+ log.info("[OKX] 初始本金(USDT余额): {}", initialPrincipal);
+ break;
+ }
+ }
+ }
}
// 设置双向持仓模式
@@ -237,9 +245,18 @@
private void refreshInitialPrincipal() {
try {
JSONObject account = executorGet("/api/v5/account/balance");
- JSONArray details = account.getJSONArray("data");
- if (details != null && !details.isEmpty()) {
- this.initialPrincipal = details.getJSONObject(0).getBigDecimal("totalEq");
+ JSONArray dataArr = account.getJSONArray("data");
+ if (dataArr != null && !dataArr.isEmpty()) {
+ JSONArray details = dataArr.getJSONObject(0).getJSONArray("details");
+ if (details != null) {
+ for (int i = 0; i < details.size(); i++) {
+ JSONObject currency = details.getJSONObject(i);
+ if ("USDT".equals(currency.getString("ccy"))) {
+ this.initialPrincipal = currency.getBigDecimal("eq");
+ break;
+ }
+ }
+ }
}
} catch (Exception e) {
log.warn("[OKX] 获取初始化本金失败，使用旧值: {}", initialPrincipal);
--
Gitblit v1.9.1