From c8b80dc38d75e89aa44574659b154ddea2e8fce5 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 07 Jan 2026 14:16:32 +0800
Subject: [PATCH] refactor(okx): 重构WebSocket客户端实现止盈止损逻辑

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
index fc9873b..3abaa37 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
@@ -1,6 +1,8 @@
 package com.xcong.excoin.modules.okxNewPrice.okxWs;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
@@ -12,6 +14,7 @@
 import org.java_websocket.client.WebSocketClient;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -130,7 +133,11 @@
     public static void orderZhiYingEvent(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {
 
 
-        log.info("开始执行TradeOrderWs......");
+        log.info("开始执行限价{}......",JSONUtil.parse(tradeRequestParam));
+        if (tradeRequestParam == null){
+            log.warn("限价下单参数缺失,取消发送");
+            return;
+        }
         String accountName = tradeRequestParam.getAccountName();
         String markPx = tradeRequestParam.getMarkPx();
         String instId = tradeRequestParam.getInstId();
@@ -143,13 +150,6 @@
         String clOrdId = tradeRequestParam.getClOrdId();
         String side = tradeRequestParam.getSide();
         String sz = tradeRequestParam.getSz();
-        log.info("账户:{},触发价格:{},币种:{},方向:{},买卖:{},数量:{},是否允许下单:{},编号:{},",
-                accountName, markPx, instId, posSide,side,  sz, tradeType, clOrdId);
-        //验证是否允许下单
-        if (StrUtil.isNotEmpty(tradeType) && OrderParamEnums.TRADE_NO.getValue().equals(tradeType)) {
-            log.warn("账户{}不允许下单,取消发送", accountName);
-            return;
-        }
         /**
          * 校验必要参数
          * 验证下单参数是否存在空值
@@ -167,6 +167,13 @@
 
         ){
             log.warn("下单参数缺失,取消发送");
+            return;
+        }
+        log.info("账户:{},触发价格:{},币种:{},方向:{},买卖:{},数量:{},是否允许下单:{},编号:{},",
+                accountName, markPx, instId, posSide,side,  sz, tradeType, clOrdId);
+        //验证是否允许下单
+        if (StrUtil.isNotEmpty(tradeType) && OrderParamEnums.TRADE_NO.getValue().equals(tradeType)) {
+            log.warn("账户{}不允许下单,取消发送", accountName);
             return;
         }
 
@@ -201,7 +208,6 @@
             log.error("下单构建失败", e);
         }
     }
-
 
 
     /**

--
Gitblit v1.9.1