From df80c37962892f3374b3ebca7136582086c30a45 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Dec 2025 15:52:19 +0800
Subject: [PATCH] refactor(okxNewPrice): 调整buyCntTime存储位置至TradeOrderWs

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 3a42d27..b2dfa15 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;
 
 /**
@@ -113,6 +114,7 @@
         if (BigDecimal.ZERO.compareTo( pos) >= 0) {
             log.error("持仓数量为零,进行初始化订单");
             WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
+            buyCntTimeEvent(new BigDecimal(CoinEnums.BUY_CNT.name()),new BigDecimal(CoinEnums.BUY_CNT.name()));
             return OrderParamEnums.INIT.getValue();
         }
         // 判断是否保证金超标
@@ -149,7 +151,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(markPx));
                     WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
+                    buyCntTimeEvent(avgPx,markPx);
                     return OrderParamEnums.BUY.getValue();
                 } else {
                     log.info("未触发加仓......,等待");
@@ -165,6 +169,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(markPx));
 
                     // 判断当前是否盈利
                     BigDecimal uplValue = PositionsWs.POSITIONSWSMAP.get("upl");
@@ -206,6 +211,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