fix(gateApi): 修复网格交易中的订单取消和止损追加逻辑

Administrator

2026-06-16 2a9a89b2a38dca9ca235ec5ec3c0de0faa8aef32

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

@@ -1030,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);
                        }
                    }
                }
@@ -1078,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();
                        /**
                         * 看是否有空仓挂单，有就取消
                         */
@@ -1099,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));
                        }

                    }
@@ -1228,7 +1234,7 @@
        }
        log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
        for (int i = 0; i < filledQty; i++) {
            int newSlId = furthestSlId - i - 1;
            int newSlId = furthestSlId - i - 2;
            GridElement elem = GridElement.findById(newSlId);
            if (elem == null) {
                continue;
@@ -1261,7 +1267,7 @@
        }
        log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
        for (int i = 0; i < filledQty; i++) {
            int newSlId = furthestSlId + i + 1;
            int newSlId = furthestSlId + i + 2;
            GridElement elem = GridElement.findById(newSlId);
            if (elem == null) {
                continue;