From c09fdd652e87ec4a067f7b8ca855de5229c8a9ed Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 09 Dec 2025 22:37:09 +0800
Subject: [PATCH] fix(okxNewPrice): 修复买入数量判断逻辑

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 5aca7d2..9b4be9b 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;
@@ -277,14 +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 totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";
-
             String upl = (String) redisUtils.get(uplKey);
+            if (StrUtil.isBlank(upl)){
+                upl = "0";
+            }
+
+            String totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";
             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;

--
Gitblit v1.9.1