From 8a9f1fee85bb10e7d3da63d2beb436f65432801c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 05 Jan 2026 13:04:04 +0800
Subject: [PATCH] fix(okxWs): 修复下单日志参数缺失问题
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 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..4b707f0 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,7 @@
package com.xcong.excoin.modules.okxNewPrice.okxWs;
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;
@@ -36,7 +37,7 @@
public static void orderEvent(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {
- log.info("开始执行TradeOrderWs......");
+ log.info("开始执行TradeOrderWs{}......", JSONUtil.parse(tradeRequestParam));
String accountName = tradeRequestParam.getAccountName();
String markPx = tradeRequestParam.getMarkPx();
String instId = tradeRequestParam.getInstId();
@@ -49,8 +50,8 @@
String clOrdId = tradeRequestParam.getClOrdId();
String side = tradeRequestParam.getSide();
String sz = tradeRequestParam.getSz();
- log.info("账户：{}，触发价格：{}，币种：{}，方向：{}，买卖：{}，数量：{}，是否允许下单：{}，编号：{}，",
- accountName, markPx, instId, posSide,side, sz, tradeType, clOrdId);
+ log.info("账户：{}，类型：{}，触发价格：{}，币种：{}，方向：{}，买卖：{}，数量：{}，是否允许下单：{}，编号：{}，",
+ accountName,ordType, markPx, instId, posSide,side, sz, tradeType, clOrdId);
//验证是否允许下单
if (StrUtil.isNotEmpty(tradeType) && OrderParamEnums.TRADE_NO.getValue().equals(tradeType)) {
log.warn("账户{}不允许下单，取消发送", accountName);
@@ -74,6 +75,10 @@
log.warn("下单参数缺失，取消发送");
return;
}
+ if (BigDecimal.ZERO.compareTo(new BigDecimal(sz)) >= 0) {
+ log.warn("下单数量{}不允许下单，取消发送", sz);
+ return;
+ }
/**
* 检验账户和仓位是否准备就绪
@@ -82,18 +87,23 @@
* 平多：卖出平多（side 填写 sell；posSide 填写 long ）
* 平空：买入平空（side 填写 buy； posSide 填写 short ） 需要检验仓位通道是否准备就绪
*/
+ //买入开多、卖出开空则验证仓位通道是否准备就绪
String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
- BigDecimal positionsReadyState = PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name()) == null
- ? BigDecimal.ZERO : PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name());
- if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
- log.info("仓位{}通道未就绪，取消发送",positionAccountName);
- return;
- }
- String accountReadyState = AccountWs.getAccountMap(accountName).get(CoinEnums.READY_STATE.name());
- if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
- log.info("账户通道未就绪，取消发送");
- return;
+ boolean b = posSide.equals(CoinEnums.POSSIDE_LONG.getCode()) && side.equals(CoinEnums.SIDE_BUY.getCode());
+ boolean c = posSide.equals(CoinEnums.POSSIDE_SHORT.getCode()) && side.equals(CoinEnums.SIDE_SELL.getCode());
+ if ( b || c ){
+ BigDecimal positionsReadyState = PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name()) == null
+ ? BigDecimal.ZERO : PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name());
+ if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
+ log.info("仓位{}通道未就绪，取消发送",positionAccountName);
+ return;
+ }
+ String accountReadyState = AccountWs.getAccountMap(accountName).get(CoinEnums.READY_STATE.name());
+ if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
+ log.info("账户通道未就绪，取消发送");
+ return;
+ }
}
try {
@@ -114,7 +124,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 +136,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 +157,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 +176,13 @@
log.warn("下单参数缺失，取消发送");
return;
}
+ log.info("账户：{}，类型：{}，触发价格：{}，币种：{}，方向：{}，买卖：{}，数量：{}，是否允许下单：{}，编号：{}，",
+ accountName,ordType, 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