feat(gateApi): 优化网格交易止损挂单位置计数逻辑

Administrator

2026-06-05 22edec5dd1c606bc11805b5190eb851512588209

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

@@ -1,6 +1,8 @@
package com.xcong.excoin.modules.gateApi;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.utils.dingtalk.DingTalkUtils;
import io.gate.gateapi.ApiClient;
import io.gate.gateapi.ApiException;
import io.gate.gateapi.GateApiException;
@@ -14,7 +16,6 @@
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -145,6 +146,12 @@
    private volatile BigDecimal shortPositionSize = BigDecimal.ZERO;
    private Long userId;
    private volatile BigDecimal initialPrincipal = BigDecimal.ZERO;
    private volatile GateKlineWebSocketClient wsClient;

    /** 多仓挂单张数计数器：止损触发时用当前值挂单，随后+1；挂单成交后重置为1 */
    private volatile int longEntryQty = 1;
    /** 空仓挂单张数计数器：止损触发时用当前值挂单，随后+1；挂单成交后重置为1 */
    private volatile int shortEntryQty = 1;

    public GateGridTradeService(GateConfig config) {
        this.config = config;
@@ -304,7 +311,25 @@
        longPriceQueue.clear();
        currentLongOrderIds.clear();
        currentShortOrderIds.clear();
        log.info("[Gate] 网格策略已启动");
        longEntryQty = 1;
        shortEntryQty = 1;

        // 每次重启重新获取当前本金
        refreshInitialPrincipal();

        log.info("[Gate] 网格策略已启动, 当前本金: {} USDT", initialPrincipal);
    }

    /**
     * 重新获取当前账户权益作为初始本金。
     */
    private void refreshInitialPrincipal() {
        try {
            FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
            this.initialPrincipal = new BigDecimal(account.getTotal());
        } catch (Exception e) {
            log.warn("[Gate] 获取初始化本金失败，使用旧值: {}", initialPrincipal);
        }
    }

    /**
@@ -342,20 +367,35 @@
        lastKlinePrice = closePrice;
        updateUnrealizedPnl();
        if (state == StrategyState.STOPPED) {
            try {
                futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
            } catch (ApiException e) {
                e.printStackTrace();
            }
            closeExistingPositions();

            BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
            log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
                    cumulativePnl, unrealizedPnl, totalPnl);

            startGrid();
            return;
        }

        //初始化0位置的开仓，并且用空的开仓价格，作为价格基准来划分网格
        if (state == StrategyState.WAITING_KLINE) {
            if (wsClient == null || !wsClient.areAllSubscribed()) {
                return;
            }
            state = StrategyState.OPENING;
            log.info("[Gate] 首根K线到达，开基底仓位...");
            executor.openLong(config.getQuantity(), (orderId) -> {
            log.info("[Gate] 首根K线到达，开基底仓位 多空各{}张...", config.getBaseQuantity());
            executor.openLong(config.getBaseQuantity(), (orderId) -> {
                TraderParam baseLongTp = TraderParam.builder()
                        .entryOrderId(orderId)
                        .build();
                config.setBaseLongTraderParam(baseLongTp);
            }, null);
            executor.openShort(negate(config.getQuantity()), (orderId) -> {
            executor.openShort(negate(config.getBaseQuantity()), (orderId) -> {
                TraderParam baseShortTp = TraderParam.builder()
                        .entryOrderId(orderId)
                        .build();
@@ -368,8 +408,7 @@
        if (state != StrategyState.ACTIVE) {
            return;
        }
        processLongGrid(closePrice);
        processShortGrid(closePrice);
        checkProfitAndReset();
    }

    // ---- 仓位推送回调 ----
@@ -417,15 +456,14 @@
                    tryGenerateQueues();
                }else {
                    longPositionSize = size;
                    //取消多仓位线以上的开空仓挂单
                    List<GridElement> allShortOrders = GridElement.findAllShortOrders(longEntryPrice);
                    if (CollUtil.isNotEmpty(allShortOrders)){
                        for (GridElement e : allShortOrders) {
                            executor.cancelOrder(e.getShortOrderId());
                        }
                    }
//                    checkShortEntryOrderToCancel();
//                    checkLongEntryOrderToCancel();
                }
            } else {
                if (longActive && state == StrategyState.ACTIVE) {
                    log.info("[Gate] 多仓持仓归零，重置策略");
                    handlePositionZeroAndReset("多仓");
                }
                longActive = false;
                longPositionSize = BigDecimal.ZERO;
            }
@@ -441,17 +479,89 @@
                    tryGenerateQueues();
                }else {
                    shortPositionSize = size.abs();
                    //取消空仓仓位线以下的开多仓挂单
                    List<GridElement> allLongOrders = GridElement.findAllLongOrders(shortEntryPrice);
                    if (CollUtil.isNotEmpty(allLongOrders)){
                        for (GridElement e : allLongOrders) {
                            executor.cancelOrder(e.getLongOrderId());
                        }
                    }
//                    checkShortEntryOrderToCancel();
//                    checkLongEntryOrderToCancel();
                }
            } else {
                if (shortActive && state == StrategyState.ACTIVE) {
                    log.info("[Gate] 空仓持仓归零，重置策略");
                    handlePositionZeroAndReset("空仓");
                }
                shortActive = false;
                shortPositionSize = BigDecimal.ZERO;
            }
        }
    }

    private void checkShortEntryOrderToCancel() {
        List<GridElement> allLongOrders = GridElement.findAllShortOrders(shortEntryPrice);
        if (CollUtil.isNotEmpty(allLongOrders)){
            GridElement keep = allLongOrders.stream()
                    .min((a, b) -> a.getGridPrice().compareTo(b.getGridPrice()))
                    .orElse(null);
            for (GridElement e : allLongOrders) {
                if (e == keep) {
                    continue;
                }
                executor.cancelConditionalOrder(
                        e.getShortOrderId(),
                        orderId -> {
                            shortEntryTraderIdParam(
                                    e,
                                    null,
                                    false
                            );
                        }
                );
                if (e.getShortTakeProfitOrderId() != null){
                    executor.cancelConditionalOrder(
                            e.getShortTakeProfitOrderId(),
                            orderId -> {
                                shortTakeProfitTraderIdParam(
                                        e,
                                        null,
                                        false
                                );
                            }
                    );
                }
            }
        }
    }

    private void checkLongEntryOrderToCancel() {
        List<GridElement> allShortOrders = GridElement.findAllLongOrders(longEntryPrice);
        if (CollUtil.isNotEmpty(allShortOrders)){
            GridElement keep = allShortOrders.stream()
                    .max((a, b) -> a.getGridPrice().compareTo(b.getGridPrice()))
                    .orElse(null);
            for (GridElement e : allShortOrders) {
                if (e == keep) {
                    continue;
                }
                executor.cancelConditionalOrder(
                        e.getLongOrderId(),
                        orderId -> {
                            longEntryTraderIdParam(
                                    e,
                                    null,
                                    false
                            );
                        }
                );

                if (e.getLongTakeProfitOrderId() != null){
                    executor.cancelConditionalOrder(
                            e.getLongTakeProfitOrderId(),
                            orderId -> {
                                longTakeProfitTraderIdParam(
                                        e,
                                        null,
                                        false
                                );
                            }
                    );
                }
            }
        }
    }
@@ -474,14 +584,16 @@
            return;
        }
        cumulativePnl = cumulativePnl.add(pnl);
        log.info("[Gate] 盈亏累加:{}, 方向:{}, 累计:{}", pnl, side, cumulativePnl);
        updateUnrealizedPnl();
        BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
        log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
                cumulativePnl, unrealizedPnl, totalPnl);
        if(totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
            String logMessage = StrUtil.format("[Gate] 已达亏损风险值(合计{}), 已实现:{}, 未实现:{}",
                    totalPnl, cumulativePnl, unrealizedPnl);
            log.info(logMessage);

        if (cumulativePnl.compareTo(config.getOverallTp()) >= 0) {
            log.info("[Gate] 已达止盈目标 {}→已停止", cumulativePnl);
            state = StrategyState.STOPPED;
        } else if (cumulativePnl.compareTo(config.getMaxLoss().negate()) <= 0) {
            log.info("[Gate] 已达亏损上限 {}→已停止", cumulativePnl);
            state = StrategyState.STOPPED;
            DingTalkUtils.getDefault().sendActionCard("风险提醒", logMessage, config.getApiKey(), "");
        }
    }

@@ -514,11 +626,11 @@
                    null,
                    false
            );
            longEntryTraderIdParam(
                    byLongTakeProfitOrderId,
                    null,
                    false
            );
//            longEntryTraderIdParam(
//                    byLongTakeProfitOrderId,
//                    null,
//                    false
//            );
        }
        GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
        if (byShortTakeProfitOrderId != null){
@@ -527,11 +639,11 @@
                    null,
                    false
            );
            shortEntryTraderIdParam(
                    byShortTakeProfitOrderId,
                    null,
                    false
            );
//            shortEntryTraderIdParam(
//                    byShortTakeProfitOrderId,
//                    null,
//                    false
//            );
        }

        /**
@@ -540,6 +652,11 @@
        GridElement longGridElement = GridElement.findByLongOrderId(orderId);
        if (longGridElement != null) {
            if (longGridElement.isHasLongOrder()){
                longEntryTraderIdParam(
                        longGridElement,
                        null,
                        false
                );
                if (longGridElement.getLongTakeProfitOrderId() == null){
                    BigDecimal longTp = longGridElement.getLongTraderParam().getTakeProfitPrice();
                    if (longTp != null) {
@@ -563,6 +680,11 @@
        GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
        if (shortGridElement != null) {
            if (shortGridElement.isHasShortOrder()){
                shortEntryTraderIdParam(
                        shortGridElement,
                        null,
                        false
                );
                if (shortGridElement.getShortTakeProfitOrderId() == null){
                    BigDecimal shortTp = shortGridElement.getShortTraderParam().getTakeProfitPrice();
                    if (shortTp != null) {
@@ -613,7 +735,7 @@
     * @param reason    变更原因
     * @param orderType 订单类型（plan-close-long-position 等）
     */
    public void onAutoOrder(String orderId, String status, String reason, String orderType) {
    public void onAutoOrder(String orderId, String status, String reason, String orderType, String tradeId) {
        if (state == StrategyState.STOPPED) {
            return;
        }
@@ -623,81 +745,154 @@
            return;
        }

        /**
         * 匹配止盈单止盈
         */
        GridElement byLongTakeProfitOrderId = GridElement.findByLongTakeProfitOrderId(orderId);
        if (byLongTakeProfitOrderId != null){
            longTakeProfitTraderIdParam(
                    byLongTakeProfitOrderId,
                    null,
                    false
            );
            longEntryTraderIdParam(
                    byLongTakeProfitOrderId,
                    null,
                    false
            );
        GridElement longStopLossElem = GridElement.findByLongStopLossOrderId(orderId);
        if (longStopLossElem != null) {
            handleLongStopLossTriggered(longStopLossElem);
            return;
        }
        GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
        if (byShortTakeProfitOrderId != null){
            shortTakeProfitTraderIdParam(
                    byShortTakeProfitOrderId,
                    null,
                    false
            );
            shortEntryTraderIdParam(
                    byShortTakeProfitOrderId,
                    null,
                    false
            );
        GridElement shortStopLossElem = GridElement.findByShortStopLossOrderId(orderId);
        if (shortStopLossElem != null) {
            handleShortStopLossTriggered(shortStopLossElem);
            return;
        }

        /**
         * 匹配挂单
         */
//        GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
//        if (byShortTakeProfitOrderId != null){
//            shortTakeProfitTraderIdParam(
//                    byShortTakeProfitOrderId,
//                    null,
//                    false
//            );
//            shortEntryTraderIdParam(
//                    byShortTakeProfitOrderId,
//                    null,
//                    false
//            );
//            TPonUserTradeShortEntry(byShortTakeProfitOrderId);
//        }
//        GridElement byLongTakeProfitOrderId = GridElement.findByLongTakeProfitOrderId(orderId);
//        if (byLongTakeProfitOrderId != null){
//            longTakeProfitTraderIdParam(
//                    byLongTakeProfitOrderId,
//                    null,
//                    false
//            );
//            longEntryTraderIdParam(
//                    byLongTakeProfitOrderId,
//                    null,
//                    false
//            );
//            TPonUserTradeLongEntry(byLongTakeProfitOrderId);
//        }

        GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
        if (shortGridElement != null) {
            if (shortGridElement.isHasShortOrder() && !tradeId.equals("0")){
                int filledQty = Integer.parseInt(shortGridElement.getShortTraderParam().getQuantity());
                shortEntryTraderIdParam(shortGridElement, null, false);
                shortEntryQty = 1;
                extendShortStopLoss(filledQty);
                log.info("[Gate] 空单成交 gridId:{}, qty:{}, 追挂止损", shortGridElement.getId(), filledQty);
            }
        }
        GridElement longGridElement = GridElement.findByLongOrderId(orderId);
        if (longGridElement != null) {
            if (longGridElement.isHasLongOrder()){
                if (longGridElement.getLongTakeProfitOrderId() == null){
                    BigDecimal longTp = longGridElement.getLongTraderParam().getTakeProfitPrice();
                    if (longTp != null) {
                        executor.placeTakeProfit(longTp,
                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
                                ORDER_TYPE_CLOSE_LONG,
                                negate(config.getQuantity()),
                                (profitId) -> {
                                    longTakeProfitTraderIdParam(
                                            longGridElement,
                                            profitId,
                                            true
                                    );
                                });
                        log.info("[Gate] 多单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, longTp, negate(config.getQuantity()));
                        return;
                    }
            if (longGridElement.isHasLongOrder() && !tradeId.equals("0")){
                int filledQty = Integer.parseInt(longGridElement.getLongTraderParam().getQuantity());
                longEntryTraderIdParam(longGridElement, null, false);
                longEntryQty = 1;
                extendLongStopLoss(filledQty);
                log.info("[Gate] 多单成交 gridId:{}, qty:{}, 追挂止损", longGridElement.getId(), filledQty);
            }
        }
    }

    private void TPonUserTradeShortEntry(GridElement gridElement) {
        if (!isMarginSafe()) {
            log.warn("[Gate] 保证金超限，跳过挂条件单");
        } else {
            // 判断网格是否能开多仓，如果不能则跳过
            GridElement upGridElement = GridElement.findById(gridElement.getUpId());
            if (upGridElement != null){
                BigDecimal upGridPrice = upGridElement.getGridPrice();
                TraderParam upLongTraderParam = upGridElement.getLongTraderParam();
                if (
                        !upGridElement.isHasLongOrder() &&
                                upGridPrice.compareTo(longEntryPrice) <= 0
                ){
                    placeEntryOrderWithPreFlag(upGridElement, true,
                            upLongTraderParam.getEntryPrice(),
                            FuturesPriceTrigger.RuleEnum.NUMBER_1,
                            upLongTraderParam.getQuantity());
                }
            }
        }
        GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
        if (shortGridElement != null) {
            if (shortGridElement.isHasShortOrder()){
                if (shortGridElement.getShortTakeProfitOrderId() == null){
                    BigDecimal shortTp = shortGridElement.getShortTraderParam().getTakeProfitPrice();
                    if (shortTp != null) {
                        executor.placeTakeProfit(shortTp,
                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                ORDER_TYPE_CLOSE_SHORT,
                                config.getQuantity(),
                                (profitId) -> {
                                    shortTakeProfitTraderIdParam(
                                            shortGridElement,
                                            profitId,
                                            true
                                    );
                                });
                        log.info("[Gate] 空单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, shortTp, config.getQuantity());
                    }
    }

    private void TPonUserTradeLongEntry(GridElement gridElement) {
        if (!isMarginSafe()) {
            log.warn("[Gate] 保证金超限，跳过挂条件单");
        } else {
            // 判断网格是否能开空仓，如果不能则跳过
            GridElement downGridElement = GridElement.findById(gridElement.getDownId());
            if (downGridElement != null){

                BigDecimal downGridPrice = downGridElement.getGridPrice();

                TraderParam shortTraderParam = downGridElement.getShortTraderParam();
                if (
                        !downGridElement.isHasShortOrder() &&
                                downGridPrice.compareTo(shortEntryPrice) >= 0
                ){
                    placeEntryOrderWithPreFlag(downGridElement, false,
                            shortTraderParam.getEntryPrice(),
                            FuturesPriceTrigger.RuleEnum.NUMBER_2,
                            negate(config.getQuantity()));
                }
            }
        }
    }

    private void onUserTradeShortEntry(GridElement gridElement) {
        if (!isMarginSafe()) {
            log.warn("[Gate] 保证金超限，跳过挂条件单");
        } else {
            //下一个开仓位置
            GridElement UpGridElement = GridElement.findById(gridElement.getDownId());
            BigDecimal newLongFirst = UpGridElement.getGridPrice();

            // 判断网格是否能开空仓，如果不能则跳过
            if (UpGridElement != null) {

                if (!UpGridElement.isHasShortOrder() && shortEntryPrice.compareTo(newLongFirst) > 0) {

                    TraderParam upShortTraderParam = UpGridElement.getShortTraderParam();
                    placeEntryOrderWithPreFlag(UpGridElement, false,
                            upShortTraderParam.getEntryPrice(),
                            FuturesPriceTrigger.RuleEnum.NUMBER_2,
                            negate(upShortTraderParam.getQuantity()));
                }
            }
        }
    }

    private void onUserTradeLongEntry(GridElement gridElement) {
        if (!isMarginSafe()) {
            log.warn("[Gate] 保证金超限，跳过挂条件单");
        } else {
            //下一个开仓位置
            GridElement UpGridElement = GridElement.findById(gridElement.getUpId());
            BigDecimal newLongFirst = UpGridElement.getGridPrice() ;

            // 判断网格是否能开多仓，如果不能则跳过
            if (UpGridElement != null) {

                if (!UpGridElement.isHasLongOrder() && longEntryPrice.compareTo(newLongFirst) < 0) {
                    TraderParam upLongTraderParam = UpGridElement.getLongTraderParam();
                    placeEntryOrderWithPreFlag(UpGridElement, true,
                            upLongTraderParam.getEntryPrice(),
                            FuturesPriceTrigger.RuleEnum.NUMBER_1,
                            config.getQuantity());
                }
            }
        }
@@ -719,91 +914,59 @@
     */
    private void tryGenerateQueues() {
        if (baseLongOpened && baseShortOpened) {
            //初始化空仓队列
            generateShortQueue();
            //初始化多仓队列
            generateLongQueue();
            //初始化网格数据
            updateGridElements();

            /**
             * 挂初始位置多空仓条件单
             * 0位置的多单止盈
             * 0位置的空单止盈
             */
            GridElement baseGridElement = GridElement.findById(0);
            TraderParam baseLongTraderParam = config.getBaseLongTraderParam();
            baseGridElement.setLongOrderId(baseLongTraderParam.getEntryOrderId());
            baseGridElement.setHasLongOrder(true);
            //0位置的网格的多单止盈
            BigDecimal upTakeProfitPrice = baseGridElement.getLongTraderParam().getTakeProfitPrice();
            executor.placeTakeProfit(
                    upTakeProfitPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_1,
                    ORDER_TYPE_CLOSE_LONG,
                    negate(config.getQuantity()),
                    profitId -> {
                        longTakeProfitTraderIdParam(
                                baseGridElement,
                                profitId,
                                true
                        );
                    }
            );
            //0位置的网格的空单止盈
            TraderParam baseShortTraderParam = config.getBaseShortTraderParam();
            baseGridElement.setShortOrderId(baseShortTraderParam.getEntryOrderId());
            baseGridElement.setHasShortOrder(true);
            BigDecimal downTakeProfitPrice = baseGridElement.getShortTraderParam().getTakeProfitPrice();
            executor.placeTakeProfit(
                    downTakeProfitPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_2,
                    ORDER_TYPE_CLOSE_SHORT,
                    config.getQuantity(),
                    profitId -> {
                        shortTakeProfitTraderIdParam(
                                baseGridElement,
                                profitId,
                                true
                        );
                    }
            );

            /**
             * 挂初始位置的up位置的多单
             * 挂初始位置的down位置的空单
             */
            Integer upId = baseGridElement.getUpId();
            GridElement upGridElementOne = GridElement.findById(upId);
            BigDecimal longTp = upGridElementOne.getGridPrice();
            executor.placeConditionalEntryOrder(
                    longTp,
                    FuturesPriceTrigger.RuleEnum.NUMBER_1,
                    config.getQuantity(),
                    orderId -> {
                        longEntryTraderIdParam(
                                upGridElementOne,
                                orderId,
                                true
                        );
                    },
                    null);
            Integer downId = baseGridElement.getDownId();
            GridElement downGridElementOne = GridElement.findById(downId);
            BigDecimal shortTp = downGridElementOne.getGridPrice();
            executor.placeConditionalEntryOrder(
                    shortTp,
                    FuturesPriceTrigger.RuleEnum.NUMBER_2,
                    negate(config.getQuantity()),
                    orderId -> {
                        shortEntryTraderIdParam(
                                downGridElementOne,
                                orderId,
                                true
                        );
                    },
                    null);
            for (int id = 2; id <= 11; id++) {
                GridElement elem = GridElement.findById(id);
                if (elem == null) {
                    continue;
                }
                BigDecimal triggerPrice = elem.getGridPrice();
                int finalId = id;
                executor.placeTakeProfit(
                        triggerPrice,
                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
                        ORDER_TYPE_CLOSE_SHORT,
                        config.getQuantity(),
                        profitId -> {
                            elem.setShortStopLossOrderId(profitId);
                            GridElement.refreshIndices();
                            log.info("[Gate] 空仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
                        }
                );
            }

            for (int id = -2; id >= -11; id--) {
                GridElement elem = GridElement.findById(id);
                if (elem == null) {
                    continue;
                }
                BigDecimal triggerPrice = elem.getGridPrice();
                int finalId = id;
                executor.placeTakeProfit(
                        triggerPrice,
                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
                        ORDER_TYPE_CLOSE_LONG,
                        negate(config.getQuantity()),
                        profitId -> {
                            elem.setLongStopLossOrderId(profitId);
                            GridElement.refreshIndices();
                            log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
                        }
                );
            }

            log.info("[Gate] 止损单已全部挂完, 空仓止损: 2~11, 多仓止损: -2~-11");
            state = StrategyState.ACTIVE;
        }
    }
@@ -913,8 +1076,9 @@
        int longSize = longPriceQueue.size();
        //根据精度转换成小数
        int prec = config.getPriceScale();
        BigDecimal minTick = BigDecimal.ONE.scaleByPowerOfTen(-prec);
        BigDecimal step = config.getStep().subtract(minTick);
//        BigDecimal minTick = BigDecimal.ONE.scaleByPowerOfTen(-prec);
//        BigDecimal step = config.getStep().subtract(minTick);
        BigDecimal step = config.getStep();
        String qty = config.getQuantity();

        // 空仓队列：id 从 -1 自减, shortPriceQueue[i] → id=-(i+1)
@@ -1061,73 +1225,42 @@
            // 判断网格是否能开空仓，如果不能则跳过
            if (UpGridElement != null) {

                if (!UpGridElement.isHasShortOrder()) {

                    //挂空仓条件单
                    TraderParam upShortTraderParam = UpGridElement.getShortTraderParam();
                    executor.placeConditionalEntryOrder(
                            upShortTraderParam.getEntryPrice(),
                            FuturesPriceTrigger.RuleEnum.NUMBER_2,
                            negate(upShortTraderParam.getQuantity()),
                            orderId ->
                            {
                                shortEntryTraderIdParam(
                                        UpGridElement,
                                        orderId,
                                        true
                                );
                            },
                            null
                    );
                }
//                if (!UpGridElement.isHasShortOrder() && shortEntryPrice.compareTo(newLongFirst) > 0) {
//
//                    TraderParam upShortTraderParam = UpGridElement.getShortTraderParam();
//                    placeEntryOrderWithPreFlag(UpGridElement, false,
//                            upShortTraderParam.getEntryPrice(),
//                            FuturesPriceTrigger.RuleEnum.NUMBER_2,
//                            negate(upShortTraderParam.getQuantity()));
//                }
                int i = UpGridElement.getId() + 2;
                GridElement downGridElement = GridElement.findById(i);
                if (downGridElement != null){

                    BigDecimal downGridPrice = downGridElement.getGridPrice();

                    TraderParam downShortTraderParam = downGridElement.getShortTraderParam();
                    if (
                            !downGridElement.isHasShortOrder() &&
                                    downGridPrice.compareTo(longEntryPrice) <= 0 &&
                                    downGridPrice.compareTo(shortEntryPrice) >= 0
                    ){
                        executor.placeConditionalEntryOrder(
                                downShortTraderParam.getEntryPrice(),
                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                negate(downShortTraderParam.getQuantity()),
                                orderId ->
                                {
                                    shortEntryTraderIdParam(
                                            downGridElement,
                                            orderId,
                                            true
                                    );
                                },
                                null
                        );

                    }
//                    TraderParam downShortTraderParam = downGridElement.getShortTraderParam();
//                    if (
//                            !downGridElement.isHasShortOrder() &&
//                                    downGridPrice.compareTo(longEntryPrice) <= 0 &&
//                                    downGridPrice.compareTo(shortEntryPrice) >= 0
//                    ){
//                        placeEntryOrderWithPreFlag(downGridElement, false,
//                                downShortTraderParam.getEntryPrice(),
//                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
//                                negate(downShortTraderParam.getQuantity()));
//
//                    }

                    TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
                    if (
                            !downGridElement.isHasLongOrder() &&
                                    downGridPrice.compareTo(longEntryPrice) <= 0
                    ){
                        executor.placeConditionalEntryOrder(
                        placeEntryOrderWithPreFlag(downGridElement, true,
                                downLongTraderParam.getEntryPrice(),
                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                downLongTraderParam.getQuantity(),
                                orderId ->
                                {
                                    longEntryTraderIdParam(
                                            downGridElement,
                                            orderId,
                                            true
                                    );
                                },
                                null
                        );
                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
                                downLongTraderParam.getQuantity());
                    }
                }
            }
@@ -1198,24 +1331,13 @@
            // 判断网格是否能开多仓，如果不能则跳过
            if (UpGridElement != null) {

                if (!UpGridElement.isHasLongOrder()) {
                    //挂多仓条件单
                    TraderParam upLongTraderParam = UpGridElement.getLongTraderParam();
                    executor.placeConditionalEntryOrder(
                            upLongTraderParam.getEntryPrice(),
                            FuturesPriceTrigger.RuleEnum.NUMBER_1,
                            config.getQuantity(),
                            orderId ->
                            {
                                longEntryTraderIdParam(
                                        UpGridElement,
                                        orderId,
                                        true
                                );
                            },
                            null
                    );
                }
//                if (!UpGridElement.isHasLongOrder() && longEntryPrice.compareTo(newLongFirst) < 0) {
//                    TraderParam upLongTraderParam = UpGridElement.getLongTraderParam();
//                    placeEntryOrderWithPreFlag(UpGridElement, true,
//                            upLongTraderParam.getEntryPrice(),
//                            FuturesPriceTrigger.RuleEnum.NUMBER_1,
//                            config.getQuantity());
//                }

                int i = UpGridElement.getId() - 2;
                GridElement downGridElement = GridElement.findById(i);
@@ -1223,28 +1345,18 @@

                    BigDecimal downGridPrice = downGridElement.getGridPrice();

                    TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
                    if (
                            !downGridElement.isHasLongOrder() &&
                                    downGridPrice.compareTo(shortEntryPrice) >= 0 &&
                                    downGridPrice.compareTo(longEntryPrice) <= 0
                    ){
                        executor.placeConditionalEntryOrder(
                                downLongTraderParam.getEntryPrice(),
                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                config.getQuantity(),
                                orderId ->
                                {
                                    longEntryTraderIdParam(
                                            downGridElement,
                                            orderId,
                                            true
                                    );
                                },
                                null
                        );

                    }
//                    TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
//                    if (
//                            !downGridElement.isHasLongOrder() &&
//                                    downGridPrice.compareTo(shortEntryPrice) >= 0 &&
//                                    downGridPrice.compareTo(longEntryPrice) <= 0
//                    ){
//                        placeEntryOrderWithPreFlag(downGridElement, true,
//                                downLongTraderParam.getEntryPrice(),
//                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
//                                config.getQuantity());
//
//                    }

                    TraderParam shortTraderParam = downGridElement.getShortTraderParam();
                    if (
@@ -1252,24 +1364,188 @@
                                    downGridPrice.compareTo(shortEntryPrice) >= 0
                    ){

                        executor.placeConditionalEntryOrder(
                        placeEntryOrderWithPreFlag(downGridElement, false,
                                shortTraderParam.getEntryPrice(),
                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                negate(config.getQuantity()),
                                orderId ->
                                {
                                    shortEntryTraderIdParam(
                                            downGridElement,
                                            orderId,
                                            true
                                    );
                                },
                                null
                        );
                                negate(config.getQuantity()));
                    }
                }
            }
        }
    }

    private void handleLongStopLossTriggered(GridElement gridElement) {
        int gridId = gridElement.getId();
        int N = Math.abs(gridId);
        gridElement.setLongStopLossOrderId(null);
        log.info("[Gate] 多仓止损触发 gridId:{}, 开始追单", gridId);

        int newEntryGridId = -(N - 1);

        GridElement newEntryGrid = GridElement.findById(newEntryGridId);
        if (newEntryGrid == null) {
            log.warn("[Gate] 多仓止损触发 but gridId:{} 不存在", newEntryGridId);
            GridElement.refreshIndices();
            return;
        }

        if (N > 2) {
            int cancelGridId = -(N - 2);
            GridElement cancelGrid = GridElement.findById(cancelGridId);
            if (cancelGrid != null && cancelGrid.isHasLongOrder()) {
                executor.cancelConditionalOrder(cancelGrid.getLongOrderId(), oid -> {
                    longEntryTraderIdParam(cancelGrid, null, false);
                    log.info("[Gate] 多仓止损触发, 取消gridId:{}的多单", cancelGridId);
                });
            }
        }

        BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        longEntryQty++;
        int entryQty = longEntryQty;
        String size = new BigDecimal(String.valueOf(entryQty)).multiply(new BigDecimal(config.getQuantity())).toString();
        log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单(计数器:{}, size:{})",
                gridId, newEntryGridId, entryQty, longEntryQty, size);
        newEntryGrid.getLongTraderParam().setQuantity(size);
        placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
                FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
    }

    private void handleShortStopLossTriggered(GridElement gridElement) {
        int gridId = gridElement.getId();
        int N = gridId;
        gridElement.setShortStopLossOrderId(null);
        log.info("[Gate] 空仓止损触发 gridId:{}, 开始追单", gridId);

        int newEntryGridId = N - 1;

        GridElement newEntryGrid = GridElement.findById(newEntryGridId);
        if (newEntryGrid == null) {
            log.warn("[Gate] 空仓止损触发 but gridId:{} 不存在", newEntryGridId);
            GridElement.refreshIndices();
            return;
        }

        if (N > 2) {
            int cancelGridId = N - 2;
            GridElement cancelGrid = GridElement.findById(cancelGridId);
            if (cancelGrid != null && cancelGrid.isHasShortOrder()) {
                executor.cancelConditionalOrder(cancelGrid.getShortOrderId(), oid -> {
                    shortEntryTraderIdParam(cancelGrid, null, false);
                    log.info("[Gate] 空仓止损触发, 取消gridId:{}的空单", cancelGridId);
                });
            }
        }



        BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        shortEntryQty++;
        int entryQty = shortEntryQty;
        String size = new BigDecimal(String.valueOf(entryQty)).multiply(new BigDecimal(config.getQuantity())).toString();
        log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单(计数器:{}, size:{})",
                gridId, newEntryGridId, entryQty, shortEntryQty, size);
        newEntryGrid.getShortTraderParam().setQuantity(size);
        placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
                FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
    }

    private void extendLongStopLoss(int filledQty) {
        int furthestSlId = 0;
        for (GridElement e : config.getGridElements()) {
            if (e.getLongStopLossOrderId() != null && e.getId() < furthestSlId) {
                furthestSlId = e.getId();
            }
        }
        if (furthestSlId == 0) {
            furthestSlId = -11;
        }
        log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
        for (int i = 0; i < filledQty; i++) {
            int newSlId = furthestSlId - i - 1;
            GridElement elem = GridElement.findById(newSlId);
            if (elem == null) {
                continue;
            }
            BigDecimal triggerPrice = elem.getGridPrice();
            int finalSlId = newSlId;
            executor.placeTakeProfit(
                    triggerPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_2,
                    ORDER_TYPE_CLOSE_LONG,
                    negate(config.getQuantity()),
                    profitId -> {
                        elem.setLongStopLossOrderId(profitId);
                        GridElement.refreshIndices();
                        log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
                    }
            );
        }
    }

    private void extendShortStopLoss(int filledQty) {
        int furthestSlId = 0;
        for (GridElement e : config.getGridElements()) {
            if (e.getShortStopLossOrderId() != null && e.getId() > furthestSlId) {
                furthestSlId = e.getId();
            }
        }
        if (furthestSlId == 0) {
            furthestSlId = 11;
        }
        log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
        for (int i = 0; i < filledQty; i++) {
            int newSlId = furthestSlId + i + 1;
            GridElement elem = GridElement.findById(newSlId);
            if (elem == null) {
                continue;
            }
            BigDecimal triggerPrice = elem.getGridPrice();
            int finalSlId = newSlId;
            executor.placeTakeProfit(
                    triggerPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_1,
                    ORDER_TYPE_CLOSE_SHORT,
                    config.getQuantity(),
                    profitId -> {
                        elem.setShortStopLossOrderId(profitId);
                        GridElement.refreshIndices();
                        log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
                    }
            );
        }
    }

    private void checkProfitAndReset() {
        try {
            FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
            BigDecimal unrealisedPnl = new BigDecimal(account.getCrossUnrealisedPnl());
            BigDecimal available = new BigDecimal(account.getCrossAvailable());
            BigDecimal totalEquity = unrealisedPnl.add(available);
            BigDecimal target = initialPrincipal.add(config.getExpectedProfit());
            log.info("[Gate] 盈亏检查 cross_unrealised_pnl:{}, cross_available:{}, 合计:{}, 目标:{}",
                    unrealisedPnl, available, totalEquity, target);
            if (totalEquity.compareTo(target) > 0) {
                log.info("[Gate] 盈亏达标({}>{})，重置策略", totalEquity, target);
                state = StrategyState.STOPPED;
                closeExistingPositions();
                futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
                startGrid();
            }
        } catch (Exception e) {
            log.warn("[Gate] 盈亏检查失败", e);
        }
    }

    private void handlePositionZeroAndReset(String direction) {
        state = StrategyState.STOPPED;
        try {
            futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
        } catch (Exception e) {
            log.warn("[Gate] {}持仓归零后取消条件单失败", direction, e);
        }
        closeExistingPositions();
        startGrid();
    }

    // ---- 保证金安全阀 ----
@@ -1305,6 +1581,50 @@
     */
    private String negate(String qty) {
        return qty.startsWith("-") ? qty.substring(1) : "-" + qty;
    }

    /**
     * 预设标志位后提交条件开仓单，防止异步回调导致的竞态重复挂单。
     *
     * <p>在调用 {@link GateTradeExecutor#placeConditionalEntryOrder} 之前同步设置
     * {@code isHasLongOrder / isHasShortOrder}，关闭 WS 线程与 Executor 线程之间的
     * 检查-下单时间窗口。API 失败时自动回滚标志位。
     *
     * @param gridElement 目标网格元素
     * @param isLong      true=多仓下单，false=空仓下单
     * @param triggerPrice 触发价
     * @param rule        触发规则
     * @param size        开仓张数
     */
    private void placeEntryOrderWithPreFlag(GridElement gridElement, boolean isLong,
                                             BigDecimal triggerPrice,
                                             FuturesPriceTrigger.RuleEnum rule,
                                             String size) {
        if (isLong) {
            gridElement.setHasLongOrder(true);
        } else {
            gridElement.setHasShortOrder(true);
        }
        executor.placeConditionalEntryOrder(triggerPrice, rule, size,
                orderId -> {
                    if (isLong) {
                        longEntryTraderIdParam(gridElement, orderId, true);
                    } else {
                        shortEntryTraderIdParam(gridElement, orderId, true);
                    }
                },
                () -> {
                    if (isLong) {
                        gridElement.setHasLongOrder(false);
                        gridElement.setLongOrderId(null);
                    } else {
                        gridElement.setHasShortOrder(false);
                        gridElement.setShortOrderId(null);
                    }
                    GridElement.refreshIndices();
                    log.warn("[Gate] 条件单创建失败，回滚标志位 gridId:{}, isLong:{}", gridElement.getId(), isLong);
                }
        );
    }

    /**
@@ -1364,4 +1684,6 @@
    public Long getUserId() { return userId; }
    /** @return 当前策略状态 */
    public StrategyState getState() { return state; }
    /** 注入WS客户端，用于订阅状态检查 */
    public void setWsClient(GateKlineWebSocketClient wsClient) { this.wsClient = wsClient; }
}