From 302ebc7896dd6cc7913ac14eda7427dfa496d4ef Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 28 Dec 2025 02:52:23 +0800
Subject: [PATCH] refactor(okxWs): 重构订单信息处理逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java | 49 +------------------------------------------------
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java | 1 -
2 files changed, 1 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
index 29267aa..f03c6af 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
@@ -104,32 +104,8 @@
accFillSz, avgPx,state, fillFee,posSide
);
-
- Map<String, String> accountMap = getAccountMap(accountName);
String stateStr = TradeOrderWs.getAccountMap(accountName).get("state");
- boolean longSell = CoinEnums.POSSIDE_LONG.getCode().equals(posSide) && CoinEnums.SIDE_SELL.getCode().equals(side);
- boolean shortBuy = CoinEnums.POSSIDE_SHORT.getCode().equals(posSide) && CoinEnums.SIDE_BUY.getCode().equals(side);
- if (
- CoinEnums.ORDER_FILLED.getCode().equals(state)
- && (longSell || shortBuy)
- ){
- WsMapBuild.saveStringToMap(accountMap, "orderPrice",avgPx);
- }
-
- String clOrdIdStr = TradeOrderWs.getAccountMap(accountName).get("clOrdId");
- if (
- StrUtil.isNotBlank(clOrdIdStr)
- && clOrdId.equals(clOrdIdStr)
- && StrUtil.isNotBlank(stateStr)
- && state.equals(stateStr)
- ){
- //记录成交均价
- if (accountMap.get("orderPrice") == null){
- log.info("成交均价: {}", avgPx);
- WsMapBuild.saveStringToMap(accountMap, "orderPrice",avgPx);
- }
- WsMapBuild.saveStringToMap(TradeOrderWs.getAccountMap(accountName), "state", CoinEnums.ORDER_LIVE.getCode());
-
+ if (StrUtil.isNotBlank(stateStr) && state.equals(stateStr)){
// 使用账号特定的Map
String positionAccountName = PositionsWs.initAccountName(accountName, side);
Map<String, BigDecimal> positionsMap = PositionsWs.getAccountMap(positionAccountName);
@@ -139,29 +115,6 @@
WsMapBuild.saveStringToMap(accountWsMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());
log.info("{}: 订单详情已完成: {}, 自定义编号: {}", accountName, CoinEnums.HE_YUE.getCode(), clOrdId);
-
- TradeRequestParam tradeRequestParam = new TradeRequestParam();
- tradeRequestParam.setAccountName(accountName);
- BigDecimal zhiYingPx = getZhiYingPx(
- accountName,
- posSide,
- fillFee,
- WsMapBuild.parseBigDecimalSafe(InstrumentsWs.getAccountMap(accountName).get(CoinEnums.CTVAL.name())),
- WsMapBuild.parseBigDecimalSafe(accFillSz),
- WsMapBuild.parseBigDecimalSafe(InstrumentsWs.getAccountMap(accountName).get(CoinEnums.CONTRACTMULTIPLIER.name())),
- WsMapBuild.parseBigDecimalSafe(avgPx),
- WsMapBuild.parseBigDecimalSafe(CoinEnums.LEVERAGE.getCode())
- );
- tradeRequestParam.setMarkPx(String.valueOf(zhiYingPx));
- tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
- tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
- tradeRequestParam.setPosSide(posSide);
- tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
- tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
- tradeRequestParam.setSide(CoinEnums.POSSIDE_LONG.getCode().equals(posSide) ? CoinEnums.SIDE_SELL.getCode() : CoinEnums.SIDE_BUY.getCode());
- tradeRequestParam.setClOrdId(WsParamBuild.getOrderNum(side));
- tradeRequestParam.setSz(accFillSz);
- return tradeRequestParam;
}
return null;
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 6c1961b..93ed017 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
@@ -114,7 +114,6 @@
webSocketClient.send(jsonObject.toJSONString());
log.info("发送下单频道:{},数量：{}", side, sz);
- WsMapBuild.saveStringToMap(getAccountMap(accountName), "clOrdId", clOrdId);
WsMapBuild.saveStringToMap(getAccountMap(accountName), "state", CoinEnums.ORDER_FILLED.getCode());
/**
* 将状态更新为未准备就绪
--
Gitblit v1.9.1