From 313d5e716a61ffdfb5ac404d2f312b62b089ae8e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 15 Dec 2025 10:52:51 +0800
Subject: [PATCH] fix(okxNewPrice): 修复加仓次数间隔时间小于0时的处理逻辑

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 1547621..76fac78 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
@@ -164,13 +164,11 @@
                     log.info("开始减仓...平仓队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
                     // 手续费
                     BigDecimal feeValue = PositionsWs.POSITIONSWSMAP.get("fee").multiply(new BigDecimal("2"));
-                    // 资金费用
-                    BigDecimal fundingFeeValue = PositionsWs.POSITIONSWSMAP.get("fundingFee");
                     //未实现收益
                     BigDecimal uplValue = PositionsWs.POSITIONSWSMAP.get("upl");
                     //已实现收益
                     BigDecimal realizedPnlValue = PositionsWs.POSITIONSWSMAP.get("realizedPnl");
-                    realizedPnlValue = realizedPnlValue.add(feeValue).add(fundingFeeValue);
+                    realizedPnlValue = realizedPnlValue.add(feeValue);
 
                     //持仓保证金
                     BigDecimal imr = PositionsWs.POSITIONSWSMAP.get("imr");
@@ -214,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