From ef00aeb456a54c7a98b71617fb7e46e56d02aa78 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 29 Dec 2025 10:07:58 +0800
Subject: [PATCH] refactor(okxNewPrice): 重构止损订单处理逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java | 22 +++++++++++++---------
1 files changed, 13 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..a96690e 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
@@ -114,7 +114,6 @@
webSocketClient.send(jsonObject.toJSONString());
log.info("发送下单频道:{},数量：{}", side, sz);
- WsMapBuild.saveStringToMap(getAccountMap(accountName), "clOrdId", clOrdId);
WsMapBuild.saveStringToMap(getAccountMap(accountName), "state", CoinEnums.ORDER_FILLED.getCode());
/**
* 将状态更新为未准备就绪
@@ -127,10 +126,15 @@
}
}
- public static void orderZhiYingEvent(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {
+ public static void orderZhiYingZhiSunEventNoState(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {
log.info("开始执行TradeOrderWs......");
+ if (tradeRequestParam == null){
+
+ log.warn("下单{}参数缺失，取消发送",tradeRequestParam);
+ return;
+ }
String accountName = tradeRequestParam.getAccountName();
String markPx = tradeRequestParam.getMarkPx();
String instId = tradeRequestParam.getInstId();
@@ -143,13 +147,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;
- }
/**
* 校验必要参数
* 验证下单参数是否存在空值
@@ -169,6 +166,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;
+ }
/**
* 检验账户和仓位是否准备就绪
--
Gitblit v1.9.1