From a05ffd8ed7cb4801ad0d6c29c62d1102f40704cb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Jun 2026 22:03:34 +0800
Subject: [PATCH] refactor(gateApi): 重构网格交易服务的价格队列逻辑

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
index 40f09e0..acc0ce9 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -116,6 +116,8 @@
     private final List<BigDecimal> shortPriceQueue = Collections.synchronizedList(new ArrayList<>());
     /** 多仓价格队列,升序排列(小→大),容量 gridQueueSize */
     private final List<BigDecimal> longPriceQueue = Collections.synchronizedList(new ArrayList<>());
+    private final List<BigDecimal> totalLongPriceQueue = Collections.synchronizedList(new ArrayList<>());
+    private final List<BigDecimal> totalShortPriceQueue = Collections.synchronizedList(new ArrayList<>());
 
     /** 当前多仓条件单映射:订单ID → 止盈价格,订单成交后通过订单订阅推送匹配止盈 */
     private final Map<String, BigDecimal> currentLongOrderIds = Collections.synchronizedMap(new LinkedHashMap<>());
@@ -708,6 +710,9 @@
         BigDecimal elem = shortBaseEntryPrice.subtract(step).setScale(prec, RoundingMode.HALF_UP);
             for (int i = 0; i < config.getGridQueueSize(); i++) {
                 shortPriceQueue.add(elem);
+                totalLongPriceQueue.add( elem);
+                totalShortPriceQueue.add( elem);
+
                 elem = elem.subtract(step).setScale(prec, RoundingMode.HALF_UP);
                 if (elem.compareTo(BigDecimal.ZERO) <= 0) {
                     break;
@@ -729,10 +734,14 @@
         BigDecimal elem = shortBaseEntryPrice.add(step).setScale(prec, RoundingMode.HALF_UP);
         for (int i = 0; i < config.getGridQueueSize(); i++) {
             longPriceQueue.add(elem);
+            totalLongPriceQueue.add( elem);
+            totalShortPriceQueue.add( elem);
             elem = elem.add(step).setScale(prec, RoundingMode.HALF_UP);
         }
         longPriceQueue.sort(BigDecimal::compareTo);
         log.info("[Gate] 多队列:{}", longPriceQueue);
+        totalShortPriceQueue.sort((a, b) -> b.compareTo(a));
+        totalLongPriceQueue.sort(BigDecimal::compareTo);
     }
 
     /**
@@ -845,8 +854,8 @@
 
     private void processShortGrid(BigDecimal currentPrice) {
         BigDecimal matched = BigDecimal.ZERO;
-        synchronized (shortPriceQueue) {
-            for (BigDecimal p : shortPriceQueue) {
+        synchronized (totalLongPriceQueue) {
+            for (BigDecimal p : totalLongPriceQueue) {
                 if (p.compareTo(currentPrice) >= 0) {
                     matched =  p;
                 } else {
@@ -893,8 +902,8 @@
 
     private void processLongGrid(BigDecimal currentPrice) {
         BigDecimal matched = BigDecimal.ZERO;
-        synchronized (longPriceQueue) {
-            for (BigDecimal p : longPriceQueue) {
+        synchronized (totalShortPriceQueue) {
+            for (BigDecimal p : totalShortPriceQueue) {
                 if (p.compareTo(currentPrice) <= 0) {
                     matched = p;
                 } else {

--
Gitblit v1.9.1