From a80451b53728e62db65bafe7c4e7a43b5e3259cd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 14:11:20 +0800
Subject: [PATCH] feat(okxNewPrice): 新增止损冷静机制并优化订单状态控制

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
index eca672a..a8cc452 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -37,6 +37,7 @@
     // 构造Redis键名
     final String coinCode = CoinEnums.HE_YUE.getCode();
     final String instrumentsStateKey = InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + coinCode + ":state";
+    final String instrumentsOutKey = InstrumentsWs.INSTRUMENTSWS_CHANNEL+":" + coinCode+":out";
     final String positionsMarkPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":markPx";
     final String positionsAvgPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":avgPx";
     final String positionsOrderPriceKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":orderPrice";
@@ -53,11 +54,11 @@
      */
     @Override
     public String caoZuo() {
-        log.info("开始执行操作......");
-        String pos = (String) redisUtils.get(positionsPosKey);
-        if (StrUtil.isBlank(pos) || BigDecimal.ZERO.compareTo( new BigDecimal(pos)) <= 0) {
-            log.error("未获取到持仓数量");
-            return OrderParamEnums.INIT.getValue();
+        log.info("开始执行操作CaoZuoServiceImpl......");
+        String outStr = (String) redisUtils.get(instrumentsOutKey);
+        if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
+            log.error("止损过了......冷静一下,等待下次入场......");
+            return null;
         }
 
         // 获取合约执行操作状态
@@ -67,7 +68,8 @@
             return OrderParamEnums.ORDERING.getValue();
         }
         if (OrderParamEnums.STATE_3.getValue().equals(state)){
-            log.error("持仓盈亏超过下单总保证金,止损冷静一天......");
+            log.error("持仓盈亏超过下单总保证金,冷静止损......");
+            redisUtils.set(instrumentsOutKey, OrderParamEnums.OUT_YES.getValue(), 0);
             return OrderParamEnums.OUT.getValue();
         }
         if (OrderParamEnums.STATE_2.getValue().equals(state)){
@@ -79,6 +81,12 @@
             return OrderParamEnums.HOLDING.getValue();
         }
 
+        String pos = (String) redisUtils.get(positionsPosKey);
+        if (StrUtil.isBlank(pos) || BigDecimal.ZERO.compareTo( new BigDecimal(pos)) <= 0) {
+            log.error("未获取到持仓数量");
+            return OrderParamEnums.INIT.getValue();
+        }
+
         String uplStr = (String) redisUtils.get(positionsUplKey);
         if (StrUtil.isBlank(uplStr)){
             return OrderParamEnums.INIT.getValue();

--
Gitblit v1.9.1