fix(gateApi): 修复网格交易订单取消功能中的潜在空指针异常

Administrator

2026-06-10 5a9a6dedff749b410c62837f2a5c8900328cdb37

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

@@ -480,6 +480,8 @@
                e.printStackTrace();
            }
            closeExistingPositions();

            state = StrategyState.STOPPED;
            // 提交到 executor 末尾：单线程FIFO保证前面所有平仓/取消任务完成后才重置
            executor.submitTask(() -> {
                try { Thread.sleep(3000); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
@@ -543,12 +545,14 @@
        }

        GridElement longStopLossElem = GridElement.findByLongStopLossOrderId(orderId);
        if (longStopLossElem != null && longPositionSize.compareTo(BigDecimal.ZERO) > 0) {
//        if (longStopLossElem != null && longPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
        if (longStopLossElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
            handleLongStopLossTriggered(longStopLossElem);
            return;
        }
        GridElement shortStopLossElem = GridElement.findByShortStopLossOrderId(orderId);
        if (shortStopLossElem != null && shortPositionSize.compareTo(BigDecimal.ZERO) > 0) {
//        if (shortStopLossElem != null && shortPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
        if (shortStopLossElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
            handleShortStopLossTriggered(shortStopLossElem);
            return;
        }
@@ -852,31 +856,34 @@
            if (BigDecimal.ZERO.compareTo( matched) == 0) {
                return;
            }
            log.info("[Gate] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);

            GridElement matchedUpGridElement = GridElement.findByPrice(matched);
            if (matchedUpGridElement != null){
                Integer upId = matchedUpGridElement.getUpId();
                GridElement newEntryGrid = GridElement.findById(upId);
                if (!matchedUpGridElement.isHasLongOrder()){
                    Integer upId = matchedUpGridElement.getUpId();
                    GridElement newEntryGrid = GridElement.findById(upId);

                if (newEntryGrid != null) {
                    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);
                    }
                    if (newEntryGrid != null) {
                        log.info("[Gate] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", 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());
                    if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
                        longEntryTraderIdParam(cancelGridElement, null, false);
                        executor.cancelConditionalOrder(cancelGridElement.getLongOrderId(), oid -> {
                            log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单", cancelGridElement);
                        });
                        GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
                        if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
                            String longOrderId = cancelGridElement.getLongOrderId();
                            longEntryTraderIdParam(cancelGridElement, null, false);
                            executor.cancelConditionalOrder(longOrderId, oid -> {
                                log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单,{}", cancelGridElement.getId(),longOrderId);
                            });
                        }
                    }
                }
            }
@@ -898,36 +905,37 @@
                return;
            }

            log.info("[Gate] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);

            GridElement matchedUpGridElement = GridElement.findByPrice(matched);
            if (matchedUpGridElement != null){
                Integer downId = matchedUpGridElement.getDownId();
                GridElement newEntryGrid = GridElement.findById(downId);
                if(!matchedUpGridElement.isHasShortOrder()){
                    Integer downId = matchedUpGridElement.getDownId();
                    GridElement newEntryGrid = GridElement.findById(downId);

                if (newEntryGrid != null) {
                    if (newEntryGrid != null) {
                        log.info("[Gate] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", 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));
                        }

                    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());
                        /**
                         * 看是否有空仓挂单，有就取消
                         */
                        if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
                            String shortOrderId = cancelGridElement.getShortOrderId();
                            shortEntryTraderIdParam(cancelGridElement, null, false);
                            executor.cancelConditionalOrder(shortOrderId, oid -> {
                                log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单{}", cancelGridElement.getId(),shortOrderId);
                            });
                        }

                    }

                    GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());
                    /**
                     * 看是否有空仓挂单，有就取消
                     */
                    if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
                        shortEntryTraderIdParam(cancelGridElement, null, false);
                        executor.cancelConditionalOrder(cancelGridElement.getShortOrderId(), oid -> {
                            log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单", cancelGridElement);
                        });
                    }

                }
            }
        }