From 2e05d1bab1817d265d7eaef667811fe3a5dbcb67 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 16 Dec 2025 15:49:26 +0800
Subject: [PATCH] feat(okxNewPrice): 实现基于网格列表的交易策略
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 d50dc5c..be34982 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,10 +40,12 @@
log.info("账户通道未就绪，取消发送");
return;
}
- BigDecimal positionsReadyState = PositionsWs.getAccountMap(accountName).get(CoinEnums.READY_STATE.name()) == null
- ? BigDecimal.ZERO : PositionsWs.getAccountMap(accountName).get(CoinEnums.READY_STATE.name());
+ String posSide = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.POSSIDE.name());
+ 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("仓位通道未就绪，取消发送");
+ log.info("仓位{}通道未就绪，取消发送",positionAccountName);
return;
}
// 校验必要参数
@@ -51,7 +53,6 @@
log.warn("下单参数 side 为空，取消发送");
return;
}
- String posSide = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.POSSIDE.name());
// 校验必要参数
if (StrUtil.isBlank(posSide)) {
log.warn("下单参数 posSide 为空，取消发送");
@@ -66,7 +67,7 @@
}else if (OrderParamEnums.OUT.getValue().equals(side)){
log.info("当前状态为止损");
side = OrderParamEnums.SELL.getValue();
- buyCnt = String.valueOf(PositionsWs.getAccountMap(accountName).get("pos"));
+ buyCnt = String.valueOf(PositionsWs.getAccountMap(positionAccountName).get("pos"));
}else if (OrderParamEnums.INIT.getValue().equals(side)){
log.info("当前状态为初始化");
side = OrderParamEnums.BUY.getValue();
@@ -78,7 +79,7 @@
buyCnt = String.valueOf(new BigDecimal(buyCntTime).multiply(new BigDecimal(buyCntStr)));
}else if (OrderParamEnums.SELL.getValue().equals(side)){
log.info("当前状态为减仓");
- buyCnt = String.valueOf(PositionsWs.getAccountMap(accountName).get("pos"));
+ buyCnt = String.valueOf(PositionsWs.getAccountMap(positionAccountName).get("pos"));
}else{
log.warn("交易状态异常，取消发送");
return;
@@ -90,14 +91,14 @@
}else if (OrderParamEnums.OUT.getValue().equals(side)){
log.info("当前状态为止损");
side = OrderParamEnums.BUY.getValue();
- buyCnt = String.valueOf(PositionsWs.getAccountMap(accountName).get("pos"));
+ buyCnt = String.valueOf(PositionsWs.getAccountMap(positionAccountName).get("pos"));
}else if (OrderParamEnums.INIT.getValue().equals(side)){
log.info("当前状态为初始化");
side = OrderParamEnums.SELL.getValue();
buyCnt = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
}else if (OrderParamEnums.BUY.getValue().equals(side)){
log.info("当前状态为减仓");
- buyCnt = String.valueOf(PositionsWs.getAccountMap(accountName).get("pos"));
+ buyCnt = String.valueOf(PositionsWs.getAccountMap(positionAccountName).get("pos"));
}else if (OrderParamEnums.SELL.getValue().equals(side)){
log.info("当前状态为加仓");
String buyCntTime = getAccountMap(accountName).get("buyCntTime");
@@ -135,11 +136,11 @@
log.info("发送下单频道:{},数量：{}", side, buyCnt);
WsMapBuild.saveStringToMap(getAccountMap(accountName), "buyCntTime",String.valueOf(BigDecimal.ONE));
- WsMapBuild.saveStringToMap(getAccountMap(accountName), "clOrdId", clOrdId);
- WsMapBuild.saveStringToMap(getAccountMap(accountName), "state", CoinEnums.ORDER_FILLED.getCode());
+ WsMapBuild.saveStringToMap(getAccountMap(accountName), "clOrdId", clOrdId);
+ WsMapBuild.saveStringToMap(getAccountMap(accountName), "state", CoinEnums.ORDER_FILLED.getCode());
- WsMapBuild.saveBigDecimalToMap(PositionsWs.getAccountMap(accountName), CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));
- WsMapBuild.saveStringToMap(AccountWs.getAccountMap(accountName), CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());
+ WsMapBuild.saveBigDecimalToMap(PositionsWs.getAccountMap(positionAccountName), CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));
+ WsMapBuild.saveStringToMap(AccountWs.getAccountMap(accountName), CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());
} catch (Exception e) {
log.error("下单构建失败", e);
--
Gitblit v1.9.1