From 081ed1a024eda884dbf52e44d32b32f240d3745f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 21:21:19 +0800
Subject: [PATCH] fix(okxNewPrice): 优化订单状态更新逻辑

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 281ab9d..0cc6afa 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
@@ -55,14 +55,14 @@
     @Override
     public String caoZuo() {
         log.info("开始执行操作CaoZuoServiceImpl......");
-        String outStr = (String) redisUtils.get(instrumentsOutKey);
-        if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
-            log.error("止损过了......冷静一下,等待下次入场......");
-            return null;
-        }
 
         // 获取合约执行操作状态
         String state = (String) redisUtils.get(instrumentsStateKey);
+        String outStr = (String) redisUtils.get(instrumentsOutKey);
+        if (OrderParamEnums.OUT_YES.getValue().equals(outStr) && OrderParamEnums.STATE_3.getValue().equals(state)){
+            log.error("止损过了......冷静一下,等待下次入场......");
+            return null;
+        }
         if (OrderParamEnums.STATE_4.getValue().equals(state)) {
             log.error("操作下单中,等待......");
             return OrderParamEnums.ORDERING.getValue();
@@ -150,6 +150,7 @@
                     log.info("加仓过程中发现持仓过小 :{}",isAddCang);
                     if (isAddCang){
                         log.info("触发加仓......,持仓过小");
+                        redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
                         return OrderParamEnums.BUY.getValue();
                     }
                     log.info("未触发加仓......,等待");
@@ -184,6 +185,7 @@
                                 log.info("减仓过程中发现持仓过小 :{}",isAddCang);
                                 if (isAddCang){
                                     log.info("触发加仓......,持仓过小");
+                                    redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
                                     return OrderParamEnums.BUY.getValue();
                                 }
                                 log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue);
@@ -202,6 +204,7 @@
                                 log.info("减仓过程中发现持仓过小 :{}",isAddCang);
                                 if (isAddCang){
                                     log.info("触发加仓......,持仓过小");
+                                    redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
                                     return OrderParamEnums.BUY.getValue();
                                 }
                                 log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue);

--
Gitblit v1.9.1