From 138f3b78a45e9978688eabae4bdbcd856dba442f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 09 Dec 2025 18:10:55 +0800
Subject: [PATCH] fix(okxNewPrice): 修复upl字段空值处理逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 1fb12fb..28586c3 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.okxNewPrice;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -276,14 +277,16 @@
return;
}
+ String state = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
String uplKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":upl";
String totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";
- String upl = (String) redisUtils.get(uplKey);
+ 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) {
+ if (new BigDecimal(totalOrderUsdt).compareTo(multiply) < 0 || OrderParamEnums.STATE_3.getValue().equals(state)) {
log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
TradeOrderWs.orderEvent(webSocketClient, redisUtils, OrderParamEnums.OUT.getValue());
return;
--
Gitblit v1.9.1