From 1ba3f3e246e7b7a65ccc6c75313fcd9107a5b382 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 05 Jan 2026 10:05:31 +0800
Subject: [PATCH] fix(okxWs): 修复持仓价格获取空指针异常
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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..b04fa8f 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
@@ -140,6 +140,8 @@
log.info("{}: 订单详情已完成: {}, 自定义编号: {}", accountName, CoinEnums.HE_YUE.getCode(), clOrdId);
+
+
TradeRequestParam tradeRequestParam = new TradeRequestParam();
tradeRequestParam.setAccountName(accountName);
BigDecimal zhiYingPx = getZhiYingPx(
@@ -157,7 +159,17 @@
tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
tradeRequestParam.setPosSide(posSide);
tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
- tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
+ // 获取平均持仓价格
+ // 在获取数据时提供默认值
+ BigDecimal avgPxOld = positionsMap.get("avgPx") != null ? positionsMap.get("avgPx") : BigDecimal.ZERO;
+ //根据持仓方向，判断是否需要设置限价止盈
+ if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) > 0){
+ tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
+ }else if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) < 0){
+ tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
+ }else{
+ 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);
--
Gitblit v1.9.1