From 8f69c8ca01f4be5de360f53a95837a97e7ba7e91 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Dec 2025 16:01:31 +0800
Subject: [PATCH] fix(okxNewPrice): 修复初始化订单时买入数量计算错误
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 af63cd9..e20dd8b 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
@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.concurrent.PriorityBlockingQueue;
/**
@@ -105,14 +106,23 @@
}
}
- BigDecimal ordFrozImr = ObjectUtil.isEmpty(PositionsWs.POSITIONSWSMAP.get("imr")) ? BigDecimal.ZERO : PositionsWs.POSITIONSWSMAP.get("imr");
- if (BigDecimal.ZERO.compareTo( ordFrozImr) >= 0) {
- log.error("占用保证金为零，进行初始化订单");
+ if (PositionsWs.POSITIONSWSMAP.get("pos") == null){
+ log.error("没有获取到持仓信息，等待初始化......");
+ return null;
+ }
+ BigDecimal pos = PositionsWs.POSITIONSWSMAP.get("pos");
+ if (BigDecimal.ZERO.compareTo( pos) >= 0) {
+ log.error("持仓数量为零，进行初始化订单");
WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
return OrderParamEnums.INIT.getValue();
}
// 判断是否保证金超标
- BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.TOTAL_ORDER_USDT.name()));
+ if (PositionsWs.POSITIONSWSMAP.get("imr") == null){
+ log.error("没有获取到持仓信息，等待初始化......");
+ return null;
+ }
+ BigDecimal ordFrozImr = PositionsWs.POSITIONSWSMAP.get("imr");
+ BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.ACCOUNTWSMAP.get(CoinEnums.TOTAL_ORDER_USDT.name()));
if (ordFrozImr.compareTo(totalOrderUsdt) >= 0){
log.error("已满仓......");
return OrderParamEnums.HOLDING.getValue();
@@ -144,8 +154,9 @@
DescBigDecimal kaiCang = queueKaiCang.peek();
if (kaiCang != null && markPx.compareTo(kaiCang.getValue()) <= 0 && avgPx.compareTo(kaiCang.getValue()) >= 0) {
log.info("开始加仓...开仓队列价格大于当前价格{}>{}", kaiCang.getValue(), markPx);
- WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice",String.valueOf(kaiCang.getValue()));
+ WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice",String.valueOf(markPx));
WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
+ buyCntTimeEvent(avgPx,markPx);
return OrderParamEnums.BUY.getValue();
} else {
log.info("未触发加仓......，等待");
@@ -161,7 +172,7 @@
AscBigDecimal pingCang = queuePingCang.peek();
if (pingCang != null && markPx.compareTo(pingCang.getValue()) >= 0 && avgPx.compareTo(pingCang.getValue()) < 0) {
log.info("开始减仓...平仓队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
- WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice",String.valueOf(pingCang.getValue()));
+ WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice",String.valueOf(markPx));
// 判断当前是否盈利
BigDecimal uplValue = PositionsWs.POSITIONSWSMAP.get("upl");
@@ -203,6 +214,14 @@
}
}
+ private void buyCntTimeEvent(BigDecimal avgPx, BigDecimal markPx){
+ //判断当前价格和开仓价格直接间隔除以间距，取整，获取的数量是否大于等于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);
+ WsMapBuild.saveStringToMap(TradeOrderWs.TRADEORDERWSMAP, "buyCntTime",String.valueOf(divide));
+ }
+
/**
* 根据订单价格更新开仓和平仓队列的内容。
* 若该价格不在对应队列中则加入；若已存在，则从队列中移除。
--
Gitblit v1.9.1