refactor(gateApi): 优化网格交易服务中的止损逻辑

Administrator

2026-07-15 12e518a7b719f5a060795f3bf1ca765a8532ba6e

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

@@ -134,13 +134,13 @@
    /** 多头是否活跃（有仓位） */
    private volatile boolean longActive = false;

    /** 多头累计止损次数（加仓订单成交后归零），同一网格多次止损不累加 */
    /** 多头累计止损次数（始终递增，加仓订单成交后归零） */
    private volatile int accumulatedLongLossCount = 0;
    /** 空头累计止损次数（加仓订单成交后归零），同一网格多次止损不累加 */
    /** 空头累计止损次数（始终递增，加仓订单成交后归零） */
    private volatile int accumulatedShortLossCount = 0;
    /** 最近触发止损的多头网格ID，用于判断是否是同一网格的连续止损 */
    /** 最近触发止损的多头网格ID */
    private volatile int lastLongStopLossGridId = Integer.MAX_VALUE;
    /** 最近触发止损的空头网格ID，用于判断是否是同一网格的连续止损 */
    /** 最近触发止损的空头网格ID */
    private volatile int lastShortStopLossGridId = Integer.MAX_VALUE;

    private volatile BigDecimal lastKlinePrice;
@@ -633,7 +633,7 @@
            if (StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0") ){
                int filledQty = Integer.parseInt(shortGridElement.getShortTraderParam().getQuantity());
                shortEntryTraderIdParam(shortGridElement, orderId, false);
                accumulatedShortLossCount = 0; // 空单成交，重置止损追单计数
                accumulatedShortLossCount = 0;
                lastShortStopLossGridId = Integer.MAX_VALUE;
                // [Gate-需求2] 加仓后先撤空仓所有止盈+止损，再查交易所持仓后重挂
                cancelAllShortTakeProfitsAndStopLosses();
@@ -698,7 +698,7 @@

                int filledQty = Integer.parseInt(longGridElement.getLongTraderParam().getQuantity());
                longEntryTraderIdParam(longGridElement, orderId, false);
                accumulatedLongLossCount = 0; // 多单成交，重置止损追单计数
                accumulatedLongLossCount = 0;
                lastLongStopLossGridId = Integer.MAX_VALUE;
                // [Gate-需求2] 加仓后先撤多仓所有止盈+止损，再查交易所持仓后重挂
                cancelAllLongTakeProfitsAndStopLosses();
@@ -1289,12 +1289,11 @@
        gridElement.removeLongStopLossOrderId(orderId);

        int gridId = gridElement.getId();
        // 同一网格的多个止损单触发不累加计数，视为同一批次
        if (gridId != lastLongStopLossGridId) {
            accumulatedLongLossCount++;
            lastLongStopLossGridId = gridId;
        }
        log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}, 开始追单", gridId, accumulatedLongLossCount);
        boolean sameGrid = (gridId == lastLongStopLossGridId);
        accumulatedLongLossCount++;
        lastLongStopLossGridId = gridId;
        log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}{}, 开始追单",
                gridId, accumulatedLongLossCount, sameGrid ? "(同网格)" : "");
        int newEntryGridId = gridId + 1;

        GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1308,7 +1307,7 @@
        BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
        int maxPos = config.getMaxPositionSize();
        int targetAmount = accumulatedLongLossCount + 1;
        int targetAmount = sameGrid ? Integer.parseInt(config.getQuantity()) : accumulatedLongLossCount + 1;
        int addSize;
        if (maxPos > 0) {
            int remainingRoom = maxPos - posSize;
@@ -1366,12 +1365,11 @@
        gridElement.removeShortStopLossOrderId(orderId);

        int gridId = gridElement.getId();
        // 同一网格的多个止损单触发不累加计数，视为同一批次
        if (gridId != lastShortStopLossGridId) {
            accumulatedShortLossCount++;
            lastShortStopLossGridId = gridId;
        }
        log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}, 开始追单", gridId, accumulatedShortLossCount);
        boolean sameGrid = (gridId == lastShortStopLossGridId);
        accumulatedShortLossCount++;
        lastShortStopLossGridId = gridId;
        log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}{}, 开始追单",
                gridId, accumulatedShortLossCount, sameGrid ? "(同网格)" : "");
        int newEntryGridId = gridId - 1;

        GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1385,7 +1383,7 @@
        BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
        int maxPos = config.getMaxPositionSize();
        int targetAmount = accumulatedShortLossCount + 1;
        int targetAmount = sameGrid ? Integer.parseInt(config.getQuantity()) : accumulatedShortLossCount + 1;
        int addSize;
        if (maxPos > 0) {
            int remainingRoom = maxPos - posSize;