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/OkxKlineWebSocketClient.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
index e8f5708..c089ac6 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
@@ -344,7 +344,9 @@
log.info("生成100个15分钟价格数据点成功！");
// 使用策略分析最新价格数据
MacdMaStrategy.TradingOrder tradingOrder = strategy.generateTradingOrder(historicalPrices);
-
+ if (tradingOrder == null){
+ return;
+ }
Collection<OkxQuantWebSocketClient> allClients = clientManager.getAllClients();
//如果为空，则直接返回
if (allClients.isEmpty()) {
@@ -356,36 +358,34 @@
if (accountName != null) {
// 根据信号执行交易操作
TradeRequestParam tradeRequestParam = new TradeRequestParam();
+
String posSide = tradingOrder.getPosSide();
- String side = tradingOrder.getSide();
+ tradeRequestParam.setPosSide(posSide);
String currentPrice = String.valueOf(closePx);
tradeRequestParam = caoZuoService.caoZuoStrategy(accountName, currentPrice, posSide);
+
+ String side = tradingOrder.getSide();
+ tradeRequestParam.setSide(side);
+
String clOrdId = WsParamBuild.getOrderNum(side);
tradeRequestParam.setClOrdId(clOrdId);
+
String sz = null;
- if (posSide == CoinEnums.POSSIDE_LONG.getCode()){
- if (side == CoinEnums.SIDE_BUY.getCode()){
- sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
- }else if (side == CoinEnums.SIDE_SELL.getCode()){
- BigDecimal pos = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_LONG.getCode())).get("pos");
- if (BigDecimal.ZERO.compareTo( pos) >= 0) {
- tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
- }
- sz = String.valueOf( pos);
+ if (posSide == CoinEnums.POSSIDE_LONG.getCode() && side == CoinEnums.SIDE_BUY.getCode()){
+ sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
+ tradeRequestParam.setSz(sz);
+ TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
+ }else if (posSide == CoinEnums.POSSIDE_SHORT.getCode() && side == CoinEnums.SIDE_SELL.getCode()){
+ sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
+ tradeRequestParam.setSz(sz);
+ TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
+
+ BigDecimal pos = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_LONG.getCode())).get("pos");
+ if (BigDecimal.ZERO.compareTo( pos) >= 0) {
+ TradeRequestParam tradeRequestParamOld = caoZuoService.caoZuoZhiSunEvent(accountName, String.valueOf(closePx), CoinEnums.POSSIDE_LONG.getCode());
+ TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParamOld);
}
- }else if (posSide == CoinEnums.POSSIDE_SHORT.getCode()){
- if (side == CoinEnums.SIDE_BUY.getCode()){
- BigDecimal pos = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_SHORT.getCode())).get("pos");
- if (BigDecimal.ZERO.compareTo( pos) >= 0) {
- tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
- }
- sz = String.valueOf( pos);
- }else if (side == CoinEnums.SIDE_SELL.getCode()){
- sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
- }
}
- tradeRequestParam.setSz(sz);
- TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
}
}
}
--
Gitblit v1.9.1