From 03da5e83f4d7ad60bab3223079ecfd0dc06e4c9c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Dec 2025 21:28:10 +0800
Subject: [PATCH] refactor(okx): 重构账户与仓位数据处理逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java | 20 ++++++++++++++++++--
1 files changed, 18 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 a5ed3a2..9e22ee3 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
@@ -29,6 +29,16 @@
public static void orderEvent(WebSocketClient webSocketClient, String side) {
log.info("开始执行TradeOrderWs......");
+ String accountReadyState = AccountWs.ACCOUNTWSMAP.get(CoinEnums.READY_STATE.name());
+ if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
+ log.info("账户通道未就绪，取消发送");
+ return;
+ }
+ BigDecimal positionsReadyState = PositionsWs.POSITIONSWSMAP.get(CoinEnums.READY_STATE.name());
+ if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
+ log.info("仓位通道未就绪，取消发送");
+ return;
+ }
// 校验必要参数
if (StrUtil.isBlank(side)) {
log.warn("下单参数 side 为空，取消发送");
@@ -48,7 +58,9 @@
buyCnt = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.BUY_CNT.name());
}else if (OrderParamEnums.BUY.getValue().equals(side)){
log.info("当前状态为加仓");
- buyCnt = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.BUY_CNT.name());
+ String buyCntTime = TRADEORDERWSMAP.get("buyCntTime");
+ String buyCntStr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.BUY_CNT.name());
+ buyCnt = String.valueOf(new BigDecimal(buyCntTime).multiply(new BigDecimal(buyCntStr)));
}else if (OrderParamEnums.SELL.getValue().equals(side)){
log.info("当前状态为减仓");
buyCnt = String.valueOf(PositionsWs.POSITIONSWSMAP.get("pos"));
@@ -80,9 +92,13 @@
webSocketClient.send(jsonObject.toJSONString());
log.info("发送下单频道:{},数量：{}", side, buyCnt);
- WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "clOrdId", connId);
+ WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "buyCntTime",String.valueOf(BigDecimal.ONE));
+ WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "clOrdId", clOrdId);
WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "state", CoinEnums.ORDER_FILLED.getCode());
+ WsMapBuild.saveBigDecimalToMap(PositionsWs.POSITIONSWSMAP, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));
+ WsMapBuild.saveStringToMap(AccountWs.ACCOUNTWSMAP, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());
+
} catch (Exception e) {
log.error("下单构建失败", e);
}
--
Gitblit v1.9.1