From c49fb826133d2e853e5d9a2558166ae223ff6fcc Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 12 Dec 2025 13:27:12 +0800
Subject: [PATCH] fix(okxNewPrice): 修复保证金和盈亏计算逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 c2e5abc..a5ed3a2 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
@@ -40,9 +40,11 @@
return;
}else if (OrderParamEnums.OUT.getValue().equals(side)){
log.info("当前状态为止损");
+ side = OrderParamEnums.SELL.getValue();
buyCnt = String.valueOf(PositionsWs.POSITIONSWSMAP.get("pos"));
}else if (OrderParamEnums.INIT.getValue().equals(side)){
log.info("当前状态为初始化");
+ side = OrderParamEnums.BUY.getValue();
buyCnt = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.BUY_CNT.name());
}else if (OrderParamEnums.BUY.getValue().equals(side)){
log.info("当前状态为加仓");
@@ -50,6 +52,9 @@
}else if (OrderParamEnums.SELL.getValue().equals(side)){
log.info("当前状态为减仓");
buyCnt = String.valueOf(PositionsWs.POSITIONSWSMAP.get("pos"));
+ }else{
+ log.warn("交易状态异常，取消发送");
+ return;
}
if (StrUtil.isBlank(buyCnt)) {
@@ -77,8 +82,6 @@
WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "clOrdId", connId);
WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "state", CoinEnums.ORDER_FILLED.getCode());
-
- WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
} catch (Exception e) {
log.error("下单构建失败", e);
--
Gitblit v1.9.1