假设多仓止损挂单位置: gridId=-5, -6, -7, -8 第一个止损位置: firstLongSlId = -5（最近的）

Administrator

7 hours ago e17dce370e52a2652563759300668fe662d97803

假设多仓止损挂单位置: gridId=-5, -6, -7, -8
第一个止损位置: firstLongSlId = -5（最近的）

旧逻辑:  tpGridId = shortGridElement.getId() - 2, -4, -6, -8...  (起点依赖空单成交网格, 间隔=2)
新逻辑:  tpGridId = -5, -6, -7, -8...  (起点=第一个多仓止损, 间隔=1)

特殊情况: 如果多仓还没挂过止损(firstLongSlId=0)，则回退到原逻辑

 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java

@@ -605,7 +605,7 @@
            longTakeProfitTraderIdParam(longTpElem, null, false);
            log.info("[Gate] 多仓止盈触发 gridId:{}, orderId:{}", longTpElem.getId(), orderId);
            cancelFarthestLongStopLoss();
            checkLastTakeProfitAndRestart();
//            checkLastTakeProfitAndRestart();
            return;
        }
        // [Gate-需求1] 空仓止盈触发：清空止盈状态 + 取消最远空仓止损 + 检查是否最后一个止盈
@@ -614,7 +614,7 @@
            shortTakeProfitTraderIdParam(shortTpElem, null, false);
            log.info("[Gate] 空仓止盈触发 gridId:{}, orderId:{}", shortTpElem.getId(), orderId);
            cancelFarthestShortStopLoss();
            checkLastTakeProfitAndRestart();
//            checkLastTakeProfitAndRestart();
            return;
        }

@@ -644,14 +644,30 @@
                accumulatedShortLossCount = 0; // 加仓订单成交，重置止损累计
                log.info("[Gate] 空单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);

                // 空仓持仓超过baseQuantity时，从gridId-2开始向外追挂止盈
                // 空仓持仓超过baseQuantity时，先找多仓第一个止损位置，从该位置向下挂止盈（间隔=1）
                BigDecimal shortBaseQty = new BigDecimal(config.getBaseQuantity());
                BigDecimal shortGridQty = new BigDecimal(config.getQuantity());
                if (BigDecimal.valueOf(posSize).compareTo(shortBaseQty) > 0) {
                    BigDecimal shortExcess = BigDecimal.valueOf(posSize).subtract(shortBaseQty);
                    int shortExcessCount = shortExcess.divide(shortGridQty, 0, RoundingMode.DOWN).intValue();

                    // 找多仓第一个（最近的）止损位置
                    int firstLongSlId = 0;
                    for (GridElement e : config.getGridElements()) {
                        if (e.getLongStopLossOrderId() != null) {
                            if (firstLongSlId == 0 || e.getId() > firstLongSlId) {
                                firstLongSlId = e.getId();
                            }
                        }
                    }

                    for (int i = 0; i < shortExcessCount; i++) {
                        int tpGridId = shortGridElement.getId() - 2 * (i + 1);
                        int tpGridId;
                        if (firstLongSlId != 0) {
                            tpGridId = firstLongSlId - i; // 从多仓第一个止损位置开始，向下挂，间隔=1
                        } else {
                            tpGridId = shortGridElement.getId() - 2 * (i + 1); // 无多仓止损时回退原逻辑
                        }
                        GridElement tpElem = GridElement.findById(tpGridId);
                        if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
                            continue;
@@ -687,14 +703,30 @@
                accumulatedLongLossCount = 0; // 加仓订单成交，重置止损累计
                log.info("[Gate] 多单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);

                // 多仓持仓超过baseQuantity时，从gridId+2开始向外追挂止盈
                // 多仓持仓超过baseQuantity时，先找空仓第一个止损位置，从该位置向上挂止盈（间隔=1）
                BigDecimal longBaseQty = new BigDecimal(config.getBaseQuantity());
                BigDecimal longGridQty = new BigDecimal(config.getQuantity());
                if (BigDecimal.valueOf(posSize).compareTo(longBaseQty) > 0) {
                    BigDecimal longExcess = BigDecimal.valueOf(posSize).subtract(longBaseQty);
                    int longExcessCount = longExcess.divide(longGridQty, 0, RoundingMode.DOWN).intValue();

                    // 找空仓第一个（最近的）止损位置
                    int firstShortSlId = 0;
                    for (GridElement e : config.getGridElements()) {
                        if (e.getShortStopLossOrderId() != null) {
                            if (firstShortSlId == 0 || e.getId() < firstShortSlId) {
                                firstShortSlId = e.getId();
                            }
                        }
                    }

                    for (int i = 0; i < longExcessCount; i++) {
                        int tpGridId = longGridElement.getId() + 2 * (i + 1);
                        int tpGridId;
                        if (firstShortSlId != 0) {
                            tpGridId = firstShortSlId + i; // 从空仓第一个止损位置开始，向上挂，间隔=1
                        } else {
                            tpGridId = longGridElement.getId() + 2 * (i + 1); // 无空仓止损时回退原逻辑
                        }
                        GridElement tpElem = GridElement.findById(tpGridId);
                        if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
                            continue;