From 6ed2a8742d41f1b7cf968134d98ccf2014b59752 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 05 Jan 2026 10:31:18 +0800
Subject: [PATCH] chore(log): 调整根日志级别为error
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 a45755c..ff8f721 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
@@ -131,7 +131,7 @@
WsMapBuild.saveStringToMap(TradeOrderWs.getAccountMap(accountName), "state", CoinEnums.ORDER_LIVE.getCode());
// 使用账号特定的Map
- String positionAccountName = PositionsWs.initAccountName(accountName, side);
+ String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
Map<String, BigDecimal> positionsMap = PositionsWs.getAccountMap(positionAccountName);
WsMapBuild.saveBigDecimalToMap(positionsMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));
@@ -160,16 +160,17 @@
tradeRequestParam.setPosSide(posSide);
tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
// 获取平均持仓价格
- BigDecimal avgPxOld = positionsMap.get("avgPx");
+ // 在获取数据时提供默认值
+ BigDecimal avgPxOld = positionsMap.get("avgPx") != null ? positionsMap.get("avgPx") : BigDecimal.ZERO;
+ log.info("持仓方向{}，当前持仓价格{}，止盈价格{}",posSide,avgPxOld,zhiYingPx);
//根据持仓方向，判断是否需要设置限价止盈
- boolean longFlag = CoinEnums.POSSIDE_LONG.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) > 0;
- boolean shortFlag = CoinEnums.POSSIDE_SHORT.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) < 0;
- if (longFlag || shortFlag) {
+ 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.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