From 31f509145fea44380bf314f7740356537c68ee3f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 09 Dec 2025 22:18:40 +0800
Subject: [PATCH] fix(okx): 修复持仓盈亏计算逻辑并优化异常处理
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java | 15 +++++++++++----
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java | 4 ++--
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
index 28586c3..9b4be9b 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
@@ -278,15 +278,22 @@
}
String state = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
+ if (OrderParamEnums.STATE_3.getValue().equals(state)){
+ log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
+ TradeOrderWs.orderEvent(webSocketClient, redisUtils, OrderParamEnums.OUT.getValue());
+ return;
+ }
String uplKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":upl";
+ String upl = (String) redisUtils.get(uplKey);
+ if (StrUtil.isBlank(upl)){
+ upl = "0";
+ }
+
String totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";
-
- String upl = ObjectUtil.isEmpty(redisUtils.get(uplKey)) ? "0" : (String)redisUtils.get(uplKey);
-
String totalOrderUsdt = (String) redisUtils.get(totalOrderUsdtKey);
BigDecimal multiply = new BigDecimal(upl).multiply(new BigDecimal("-1"));
- if (new BigDecimal(totalOrderUsdt).compareTo(multiply) < 0 || OrderParamEnums.STATE_3.getValue().equals(state)) {
+ if (new BigDecimal(totalOrderUsdt).compareTo(multiply) < 0) {
log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
TradeOrderWs.orderEvent(webSocketClient, redisUtils, OrderParamEnums.OUT.getValue());
return;
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
index 88236c8..ecadcce 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
@@ -154,7 +154,7 @@
}
private static String safeGetString(JSONObject obj, String key) {
- return Optional.ofNullable(obj.getString(key)).orElse("");
+ return Optional.ofNullable(obj.getString(key)).orElse("0");
}
private static BigDecimal parseBigDecimal(String value, String defaultValue) {
@@ -187,7 +187,7 @@
leverage.compareTo(BigDecimal.ZERO) <= 0 ||
faceValue.compareTo(BigDecimal.ZERO) <= 0 ||
markPrice.compareTo(BigDecimal.ZERO) <= 0) {
- throw new IllegalArgumentException("所有参数必须大于零");
+ return BigDecimal.ZERO;
}
BigDecimal divisor = markPrice.divide(leverage, 10, BigDecimal.ROUND_DOWN);
--
Gitblit v1.9.1