From f2c1b2853b2f0d0a0efb95a9c8df95ec1da908ad Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 07 Jan 2026 11:13:36 +0800
Subject: [PATCH] fix(trading): 修复交易系统中的计算错误和日志级别问题
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 4e551f6..333d3b1 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()));
@@ -161,16 +161,18 @@
tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
// 获取平均持仓价格
// 在获取数据时提供默认值
- BigDecimal avgPxOld = positionsMap.get("avgPx") != null ? positionsMap.get("avgPx") : BigDecimal.ZERO;
- log.info("持仓方向{}，当前持仓价格{}，止盈价格{}",posSide,avgPxOld,zhiYingPx);
- //根据持仓方向，判断是否需要设置限价止盈
- 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());
- }
+// BigDecimal avgPxOld = positionsMap.get("avgPx") != null ? positionsMap.get("avgPx") : BigDecimal.ZERO;
+// log.info("持仓方向{}，当前持仓价格{}，止盈价格{}",posSide,avgPxOld,zhiYingPx);
+// //根据持仓方向，判断是否需要设置限价止盈
+// 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