From 23ece6103fd890655f0eef79331d3d73921611a2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 07 Jan 2026 11:59:23 +0800
Subject: [PATCH] feat(trade): 优化交易系统止损逻辑和订单处理机制
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java | 99 +++++--------------------------------------------
1 files changed, 11 insertions(+), 88 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 5586822..36b99e1 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
@@ -130,91 +130,12 @@
}
}
- public static void orderZhiYingEvent(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {
+ public static void orderZhiYingEvent(WebSocketClient webSocketClient, List<TradeRequestParam> tradeRequestParams) {
- log.info("开始执行TradeOrderWs......");
- if (tradeRequestParam == null){
-
- log.warn("下单{}参数缺失，取消发送",tradeRequestParam);
- return;
- }
- String accountName = tradeRequestParam.getAccountName();
- String markPx = tradeRequestParam.getMarkPx();
- String instId = tradeRequestParam.getInstId();
- String tdMode = tradeRequestParam.getTdMode();
- String posSide = tradeRequestParam.getPosSide();
- String ordType = tradeRequestParam.getOrdType();
-
- String tradeType = tradeRequestParam.getTradeType();
-
- String clOrdId = tradeRequestParam.getClOrdId();
- String side = tradeRequestParam.getSide();
- String sz = tradeRequestParam.getSz();
- /**
- * 校验必要参数
- * 验证下单参数是否存在空值
- */
- if (
- StrUtil.isBlank(accountName)
- || StrUtil.isBlank(instId)
- || StrUtil.isBlank(tdMode)
- || StrUtil.isBlank(posSide)
- || StrUtil.isBlank(ordType)
- || StrUtil.isBlank(clOrdId)
- || StrUtil.isBlank(side)
- || StrUtil.isBlank(sz)
- || StrUtil.isBlank(markPx)
-
- ){
- 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;
- }
-
- /**
- * 检验账户和仓位是否准备就绪
- * 开多：买入开多（side 填写 buy； posSide 填写 long ）
- * 开空：卖出开空（side 填写 sell； posSide 填写 short ） 需要检验账户通道是否准备就绪
- * 平多：卖出平多（side 填写 sell；posSide 填写 long ）
- * 平空：买入平空（side 填写 buy； posSide 填写 short ） 需要检验仓位通道是否准备就绪
- */
-
- try {
- JSONArray argsArray = new JSONArray();
- JSONObject args = new JSONObject();
- args.put("instId", instId);
- args.put("tdMode", tdMode);
- args.put("clOrdId", clOrdId);
- args.put("side", side);
-
- args.put("posSide", posSide);
- args.put("ordType", ordType);
- args.put("sz", sz);
- args.put("px", markPx);
- argsArray.add(args);
-
- String connId = WsParamBuild.getOrderNum(ORDERWS_CHANNEL);
- JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, ORDERWS_CHANNEL, argsArray);
- webSocketClient.send(jsonObject.toJSONString());
- log.info("发送下单频道:{},数量：{}", side, sz);
-
- } catch (Exception e) {
- log.error("下单构建失败", e);
- }
- }
-
- public static void orderZhiSunEvent(WebSocketClient webSocketClient, List<TradeRequestParam> tradeRequestParams) {
-
- log.info("开始止损......");
- if (CollUtil.isEmpty(tradeRequestParams)){
- log.error("止损下单{}参数缺失，取消发送", JSONUtil.parse(tradeRequestParams));
+ log.info("开始执行限价{}......",JSONUtil.parse(tradeRequestParams));
+ if (tradeRequestParams == null){
+ log.warn("限价下单参数缺失，取消发送");
return;
}
for (TradeRequestParam tradeRequestParam : tradeRequestParams){
@@ -246,16 +167,17 @@
|| StrUtil.isBlank(markPx)
){
- log.error("止损下单参数缺失，取消发送");
+ log.warn("下单参数缺失，取消发送");
return;
}
- log.info("止损账户：{}，触发价格：{}，币种：{}，方向：{}，买卖：{}，数量：{}，是否允许下单：{}，编号：{}，",
+ log.info("账户：{}，触发价格：{}，币种：{}，方向：{}，买卖：{}，数量：{}，是否允许下单：{}，编号：{}，",
accountName, markPx, instId, posSide,side, sz, tradeType, clOrdId);
//验证是否允许下单
if (StrUtil.isNotEmpty(tradeType) && OrderParamEnums.TRADE_NO.getValue().equals(tradeType)) {
- log.error("止损账户{}不允许下单，取消发送", accountName);
+ log.warn("账户{}不允许下单，取消发送", accountName);
return;
}
+
/**
* 检验账户和仓位是否准备就绪
* 开多：买入开多（side 填写 buy； posSide 填写 long ）
@@ -263,6 +185,7 @@
* 平多：卖出平多（side 填写 sell；posSide 填写 long ）
* 平空：买入平空（side 填写 buy； posSide 填写 short ） 需要检验仓位通道是否准备就绪
*/
+
try {
JSONArray argsArray = new JSONArray();
JSONObject args = new JSONObject();
@@ -280,13 +203,13 @@
String connId = WsParamBuild.getOrderNum(ORDERWS_CHANNEL);
JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, ORDERWS_CHANNEL, argsArray);
webSocketClient.send(jsonObject.toJSONString());
- log.info("止损已发送......");
+ log.info("发送下单频道:{},数量：{}", side, sz);
+
} catch (Exception e) {
log.error("下单构建失败", e);
}
}
}
-
/**
--
Gitblit v1.9.1