fix(gateApi): 修复网格交易止损单数量计算逻辑

Administrator

2026-06-18 60752d4d6750a4ae5497a6a5d8ec132f50792c9e

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

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

    /** 多头累计止损张数（加仓订单成交后归零） */
    private volatile int accumulatedLongLossCount = 0;
    /** 空头累计止损张数（加仓订单成交后归零） */
    private volatile int accumulatedShortLossCount = 0;

    private volatile BigDecimal lastKlinePrice;
    private volatile BigDecimal markPrice = BigDecimal.ZERO;
    private volatile BigDecimal cumulativePnl = BigDecimal.ZERO;
@@ -300,6 +305,8 @@
        baseShortOpened = false;
        longActive = false;
        shortActive = false;
        accumulatedLongLossCount = 0;
        accumulatedShortLossCount = 0;
        shortPriceQueue.clear();
        longPriceQueue.clear();
        currentLongOrderIds.clear();
@@ -383,7 +390,7 @@
        }


        checkProfitAndReset();
//        checkProfitAndReset();


        if (state == StrategyState.ACTIVE &&
@@ -606,21 +613,78 @@
        GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
        if (shortGridElement != null) {
            if (shortGridElement.isHasShortOrder() && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0") ){
                int filledQty = Integer.parseInt(shortGridElement.getShortTraderParam().getQuantity());
                shortEntryTraderIdParam(shortGridElement, null, false);

                int filledQty = shortGridElement.getId();
                extendShortStopLoss(filledQty);
                extendShortStopLoss(filledQty,shortGridElement.getId());
                accumulatedShortLossCount = 0; // 加仓订单成交，重置止损累计
                log.info("[Gate] 空单成交 gridId:{}", filledQty);

                // 空仓持仓超过baseQuantity时，从gridId-2开始向外追挂止盈
                BigDecimal shortBaseQty = new BigDecimal(config.getBaseQuantity());
                BigDecimal shortGridQty = new BigDecimal(config.getQuantity());
                if (shortPositionSize.compareTo(shortBaseQty) > 0) {
                    BigDecimal shortExcess = shortPositionSize.subtract(shortBaseQty);
                    int shortExcessCount = shortExcess.divide(shortGridQty, 0, RoundingMode.DOWN).intValue();
                    for (int i = 0; i < shortExcessCount; i++) {
                        int tpGridId = shortGridElement.getId() - 2 - i;
                        GridElement tpElem = GridElement.findById(tpGridId);
                        if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
                            continue;
                        }
                        BigDecimal tpPrice = tpElem.getGridPrice();
                        int finalTpGridId = tpGridId;
                        executor.placeTakeProfit(
                                tpPrice,
                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                ORDER_TYPE_CLOSE_SHORT,
                                config.getQuantity(),
                                profitId -> {
                                    shortTakeProfitTraderIdParam(tpElem, profitId, true);
                                    log.info("[Gate] 空仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
                                            finalTpGridId, tpPrice, profitId);
                                }
                        );
                    }
                }
            }
        }
        GridElement longGridElement = GridElement.findByLongOrderId(orderId);
        if (longGridElement != null) {
            if (longGridElement.isHasLongOrder() && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")){
                longEntryTraderIdParam(longGridElement, null, false);

                int filledQty = longGridElement.getId();
                extendLongStopLoss(filledQty);
                int filledQty = Integer.parseInt(longGridElement.getLongTraderParam().getQuantity());
                longEntryTraderIdParam(longGridElement, null, false);
                extendLongStopLoss(filledQty,longGridElement.getId());
                accumulatedLongLossCount = 0; // 加仓订单成交，重置止损累计
                log.info("[Gate] 多单成交 gridId:{}", filledQty);

                // 多仓持仓超过baseQuantity时，从gridId+2开始向外追挂止盈
                BigDecimal longBaseQty = new BigDecimal(config.getBaseQuantity());
                BigDecimal longGridQty = new BigDecimal(config.getQuantity());
                if (longPositionSize.compareTo(longBaseQty) > 0) {
                    BigDecimal longExcess = longPositionSize.subtract(longBaseQty);
                    int longExcessCount = longExcess.divide(longGridQty, 0, RoundingMode.DOWN).intValue();
                    for (int i = 0; i < longExcessCount; i++) {
                        int tpGridId = longGridElement.getId() + 2 + i;
                        GridElement tpElem = GridElement.findById(tpGridId);
                        if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
                            continue;
                        }
                        BigDecimal tpPrice = tpElem.getGridPrice();
                        int finalTpGridId = tpGridId;
                        executor.placeTakeProfit(
                                tpPrice,
                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
                                ORDER_TYPE_CLOSE_LONG,
                                negate(config.getQuantity()),
                                profitId -> {
                                    longTakeProfitTraderIdParam(tpElem, profitId, true);
                                    log.info("[Gate] 多仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
                                            finalTpGridId, tpPrice, profitId);
                                }
                        );
                    }
                }
            }
        }
    }
@@ -653,39 +717,84 @@
            baseGridElement.setShortOrderId(baseShortTraderParam.getEntryOrderId());
            baseGridElement.setHasShortOrder(true);

            int shortTime = 2;
            GridElement elemShort = GridElement.findById(shortTime);
            if (elemShort != null) {
                BigDecimal triggerPrice = elemShort.getGridPrice();
                String size = config.getBaseQuantity();
//            int shortTime = 2;
//            GridElement elemShort = GridElement.findById(shortTime);
//            if (elemShort != null) {
//                BigDecimal triggerPrice = elemShort.getGridPrice();
//                String size = config.getBaseQuantity();
//                executor.placeTakeProfit(
//                        triggerPrice,
//                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
//                        ORDER_TYPE_CLOSE_SHORT,
//                        size,
//                        profitId -> {
//                            elemShort.setShortStopLossOrderId(profitId);
//                            GridElement.refreshIndices();
//                            log.info("[Gate] 空仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", shortTime, triggerPrice, profitId);
//                        }
//                );
//            }
//
//
//            int longTime = -2;
//            GridElement elemLong = GridElement.findById(longTime);
//            if (elemLong != null) {
//                BigDecimal triggerPrice = elemLong.getGridPrice();
//                String size = config.getBaseQuantity();
//                executor.placeTakeProfit(
//                        triggerPrice,
//                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
//                        ORDER_TYPE_CLOSE_LONG,
//                        negate(size),
//                        profitId -> {
//                            elemLong.setLongStopLossOrderId(profitId);
//                            GridElement.refreshIndices();
//                            log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", longTime, triggerPrice, profitId);
//                        }
//                );
//            }

            int shortTime = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
            for (int id = 2; id <= shortTime; id++) {
                GridElement elem = GridElement.findById(id);
                if (elem == null) {
                    continue;
                }
                BigDecimal triggerPrice = elem.getGridPrice();
                String size = config.getQuantity();
                int finalId = id;
                executor.placeTakeProfit(
                        triggerPrice,
                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
                        ORDER_TYPE_CLOSE_SHORT,
                        size,
                        profitId -> {
                            elemShort.setShortStopLossOrderId(profitId);
                            elem.setShortStopLossOrderId(profitId);
                            GridElement.refreshIndices();
                            log.info("[Gate] 空仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", shortTime, triggerPrice, profitId);
                            log.info("[Gate] 空仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
                        }
                );
            }


            int longTime = -2;
            GridElement elemLong = GridElement.findById(longTime);
            if (elemLong != null) {
                BigDecimal triggerPrice = elemLong.getGridPrice();
                String size = config.getBaseQuantity();
            int longTime = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
            for (int id = -2; id >= -longTime; id--) {
                GridElement elem = GridElement.findById(id);
                if (elem == null) {
                    continue;
                }
                BigDecimal triggerPrice = elem.getGridPrice();
                String size = config.getQuantity();
                int finalId = id;
                executor.placeTakeProfit(
                        triggerPrice,
                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
                        ORDER_TYPE_CLOSE_LONG,
                        negate(size),
                        profitId -> {
                            elemLong.setLongStopLossOrderId(profitId);
                            elem.setLongStopLossOrderId(profitId);
                            GridElement.refreshIndices();
                            log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", longTime, triggerPrice, profitId);
                            log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
                        }
                );
            }
@@ -811,7 +920,8 @@
        //根据精度转换成小数
        int prec = config.getPriceScale();
        BigDecimal step = config.getStep();
        String qty = config.getBaseQuantity();
//        String qty = config.getBaseQuantity();
        String qty = config.getQuantity();

        // 空仓队列：id 从 -1 自减, shortPriceQueue[i] → id=-(i+1)
        for (int i = 0; i < shortSize; i++) {
@@ -920,25 +1030,27 @@
                    GridElement newEntryGrid = GridElement.findById(upId);

                    if (newEntryGrid != null) {
//                        log.info("[Gate-2] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
                        if (!newEntryGrid.isHasLongOrder()) {
                            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
                            String size = config.getBaseQuantity();
                            log.info("[Gate] 多仓仓位归零 gridId:{}, 挂{}基础张多单",
                                    newEntryGrid.getId(),  size);
                            newEntryGrid.getLongTraderParam().setQuantity(size);
                            placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
                                    FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
                        }


                        GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
                        String quantity = cancelGridElement != null
                                ? cancelGridElement.getLongTraderParam().getQuantity()
                                : config.getBaseQuantity();
                        if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
                            String longOrderId = cancelGridElement.getLongOrderId();
                            executor.cancelConditionalOrder(longOrderId, oid -> {
                                longEntryTraderIdParam(cancelGridElement, null, false);
                                log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单,{}", cancelGridElement.getId(),longOrderId);
                            });
                        }
//                        log.info("[Gate-2] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
                        if (!newEntryGrid.isHasLongOrder()) {
                            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
                            String size = quantity;
                            log.info("[Gate] 多仓仓位归零 gridId:{}, 挂{}基础张多单",
                                    newEntryGrid.getId(),  size);
                            newEntryGrid.getLongTraderParam().setQuantity(size);
                            placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
                                    FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
                        }
                    }
                }
@@ -968,18 +1080,12 @@
                    GridElement newEntryGrid = GridElement.findById(downId);

                    if (newEntryGrid != null) {
//                        log.info("[Gate-4] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
                        if (!newEntryGrid.isHasShortOrder()){
                            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
                            String size = config.getBaseQuantity();
                            log.info("[Gate] 空仓仓位归零 gridId:{}, 挂{}基础张多单",
                                    newEntryGrid.getId(),  size);
                            newEntryGrid.getShortTraderParam().setQuantity(size);
                            placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
                                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
                        }

                        GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());

                        String quantity = cancelGridElement != null
                                ? cancelGridElement.getShortTraderParam().getQuantity()
                                : config.getBaseQuantity();
                        /**
                         * 看是否有空仓挂单，有就取消
                         */
@@ -989,6 +1095,16 @@
                                shortEntryTraderIdParam(cancelGridElement, null, false);
                                log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单{}", cancelGridElement.getId(),shortOrderId);
                            });
                        }
//                        log.info("[Gate-4] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
                        if (!newEntryGrid.isHasShortOrder()){
                            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
                            String size = quantity;
                            log.info("[Gate] 空仓仓位归零 gridId:{}, 挂{}基础张多单",
                                    newEntryGrid.getId(),  size);
                            newEntryGrid.getShortTraderParam().setQuantity(size);
                            placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
                                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
                        }

                    }
@@ -1011,12 +1127,49 @@
            return;
        }

        BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        String size = config.getBaseQuantity();
        log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单=",
                gridId, newEntryGridId, size);
        placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
                FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
        // [Gate-BugFix] 防止与"仓位归零"重复下单：若该网格已有挂单则跳过
        if (!newEntryGrid.isHasLongOrder()) {
            BigDecimal triggerPrice = newEntryGrid.getGridPrice();

            // 累计止损张数 + 当前止损量作为追单size，不再依赖positionSize（避免WS竞态）
            accumulatedLongLossCount += Integer.parseInt(config.getQuantity());
            String size = String.valueOf(accumulatedLongLossCount + Integer.parseInt(config.getQuantity()));
            log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单",
                    gridId, newEntryGridId, size);

            newEntryGrid.getLongTraderParam().setQuantity(size);
            placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
        }else{
            log.warn("[Gate] 多仓止损触发 gridId:{}, 目标gridId:{}已有挂单，跳过重复下单", gridId, newEntryGridId);
        }

        int cancelGridId = gridId + 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);
            });
        }

        // 止损触发时，取消最远的多仓止盈订单
        GridElement farthestLongTp = null;
        for (GridElement e : config.getGridElements()) {
            if (e.getLongTakeProfitOrderId() != null) {
                if (farthestLongTp == null || e.getGridPrice().compareTo(farthestLongTp.getGridPrice()) > 0) {
                    farthestLongTp = e;
                }
            }
        }
        if (farthestLongTp != null) {
            String tpOrderId = farthestLongTp.getLongTakeProfitOrderId();
            GridElement finalFarthestLongTp = farthestLongTp;
            executor.cancelConditionalOrder(tpOrderId, oid -> {
                longTakeProfitTraderIdParam(finalFarthestLongTp, null, false);
                log.info("[Gate] 多仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestLongTp.getId(), tpOrderId);
            });
        }
    }

    private void handleShortStopLossTriggered(GridElement gridElement) {
@@ -1033,28 +1186,81 @@
            return;
        }

        BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        String size =config.getBaseQuantity();
        log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单",
                gridId, newEntryGridId, size);
        newEntryGrid.getShortTraderParam().setQuantity(size);
        placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
                FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
        // [Gate-BugFix] 防止与"仓位归零"重复下单：若该网格已有挂单则跳过
        if (!newEntryGrid.isHasShortOrder()) {
            BigDecimal triggerPrice = newEntryGrid.getGridPrice();

            // 累计止损张数 + 当前止损量作为追单size，不再依赖positionSize（避免WS竞态）
            accumulatedShortLossCount += Integer.parseInt(config.getQuantity());
            String size = String.valueOf(accumulatedShortLossCount + Integer.parseInt(config.getQuantity()));
            log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单",
                    gridId, newEntryGridId, size);
            newEntryGrid.getShortTraderParam().setQuantity(size);
            placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
        }else{
            log.warn("[Gate] 空仓止损触发 gridId:{}, 目标gridId:{}已有挂单，跳过重复下单", gridId, newEntryGridId);
        }




        int cancelGridId = gridId - 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);
            });
        }

        // 止损触发时，取消最远的空仓止盈订单
        GridElement farthestShortTp = null;
        for (GridElement e : config.getGridElements()) {
            if (e.getShortTakeProfitOrderId() != null) {
                if (farthestShortTp == null || e.getGridPrice().compareTo(farthestShortTp.getGridPrice()) < 0) {
                    farthestShortTp = e;
                }
            }
        }
        if (farthestShortTp != null) {
            String tpOrderId = farthestShortTp.getShortTakeProfitOrderId();
            GridElement finalFarthestShortTp = farthestShortTp;
            executor.cancelConditionalOrder(tpOrderId, oid -> {
                shortTakeProfitTraderIdParam(finalFarthestShortTp, null, false);
                log.info("[Gate] 空仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestShortTp.getId(), tpOrderId);
            });
        }
    }

    private void extendLongStopLoss(int filledQty) {
        int furthestSlId = filledQty - 2;
        log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}", furthestSlId);
        GridElement elem = GridElement.findById(furthestSlId);
        if (elem != null) {
    private void extendLongStopLoss(int filledQty,int gridId) {
        int furthestSlId = 0;
        for (GridElement e : config.getGridElements()) {
            if (e.getLongStopLossOrderId() != null && e.getId() < furthestSlId) {
                furthestSlId = e.getId();
            }
        }

        int interval  = 1;
        if (furthestSlId == 0) {
            furthestSlId = gridId;
            interval = 2;
        }
        int stopLossCount = filledQty / Integer.parseInt(config.getQuantity());
        log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, stopLossCount);
        for (int i = 0; i < stopLossCount; i++) {
            int newSlId = furthestSlId - i - interval;
            GridElement elem = GridElement.findById(newSlId);
            if (elem == null) {
                continue;
            }
            BigDecimal triggerPrice = elem.getGridPrice();
            int finalSlId = elem.getId();
            String size = config.getBaseQuantity();
            int finalSlId = newSlId;
            executor.placeTakeProfit(
                    triggerPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_2,
                    ORDER_TYPE_CLOSE_LONG,
                    negate(size),
                    negate(config.getQuantity()),
                    profitId -> {
                        elem.setLongStopLossOrderId(profitId);
                        GridElement.refreshIndices();
@@ -1064,19 +1270,34 @@
        }
    }

    private void extendShortStopLoss(int filledQty) {
        int furthestSlId = filledQty + 2;
        log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}", furthestSlId);
        GridElement elem = GridElement.findById(furthestSlId);
        if (elem != null) {
    private void extendShortStopLoss(int filledQty, int gridId) {
        int furthestSlId = 0;
        for (GridElement e : config.getGridElements()) {
            if (e.getShortStopLossOrderId() != null && e.getId() > furthestSlId) {
                furthestSlId = e.getId();
            }
        }

        int interval  = 1;
        if (furthestSlId == 0) {
            furthestSlId = gridId;
            interval = 2;
        }
        int stopLossCount = filledQty / Integer.parseInt(config.getQuantity());
        log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, stopLossCount);
        for (int i = 0; i < stopLossCount; i++) {
            int newSlId = furthestSlId + i + interval;
            GridElement elem = GridElement.findById(newSlId);
            if (elem == null) {
                continue;
            }
            BigDecimal triggerPrice = elem.getGridPrice();
            int finalSlId = elem.getId();
            String size = config.getBaseQuantity();
            int finalSlId = newSlId;
            executor.placeTakeProfit(
                    triggerPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_1,
                    ORDER_TYPE_CLOSE_SHORT,
                    size,
                    config.getQuantity(),
                    profitId -> {
                        elem.setShortStopLossOrderId(profitId);
                        GridElement.refreshIndices();