From 90ae4f1fdad2be2720945e0f1474c971a0fdf1a6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Dec 2025 10:00:09 +0800
Subject: [PATCH] fix(okxWs): 调整账户与持仓状态设置逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
index 5f7685c..eb85417 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -100,7 +100,7 @@
BigDecimal pos = PositionsWs.POSITIONSWSMAP.get("pos");
if (BigDecimal.ZERO.compareTo( pos) >= 0) {
log.error("持仓数量为零，进行初始化订单");
- return OrderParamEnums.INIT.getValue();
+ return null;
}
// 判断是否保证金超标
if (PositionsWs.POSITIONSWSMAP.get("imr") == null){
@@ -186,12 +186,12 @@
return OrderParamEnums.HOLDING.getValue();
}
}else {
- if (uplValue.compareTo(imrValue) >= 0) {
+ if (uplValue.compareTo(imrValue.add(feeValue)) >= 0) {
WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice", String.valueOf(markPx));
- log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, realizedPnlValue);
+ log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue.add(feeValue));
return OrderParamEnums.SELL.getValue();
}else{
- log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, realizedPnlValue);
+ log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue.add(feeValue));
return OrderParamEnums.HOLDING.getValue();
}
}
@@ -212,7 +212,11 @@
//判断当前价格和开仓价格直接间隔除以间距，取整，获取的数量是否大于等于0，如果大于0，则下单基础张数*倍数
String buyCntTime = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.BUY_CNT_TIME.name());
BigDecimal subtract = avgPx.subtract(markPx);
- BigDecimal divide = subtract.divide(new BigDecimal(buyCntTime), 0, RoundingMode.DOWN).add(BigDecimal.ONE);
+ BigDecimal divide = subtract.divide(new BigDecimal(buyCntTime), 0, RoundingMode.DOWN);
+ if (divide.compareTo(BigDecimal.ZERO) <= 0){
+ log.warn("加仓次数间隔时间小于0，不加仓");
+ return false;
+ }
return WsMapBuild.saveStringToMap(TradeOrderWs.TRADEORDERWSMAP, "buyCntTime",String.valueOf(divide));
}
--
Gitblit v1.9.1