fix(trade): 修复条件单取消逻辑并添加回调支持

Administrator

2026-05-20 45a8a42e3eec8feca80dfdc6b3a433c22c9012bc

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

@@ -421,7 +421,16 @@
                    List<GridElement> allShortOrders = GridElement.findAllShortOrders(longEntryPrice);
                    if (CollUtil.isNotEmpty(allShortOrders)){
                        for (GridElement e : allShortOrders) {
                            executor.cancelOrder(e.getShortOrderId());
                            executor.cancelConditionalOrder(
                                    e.getShortOrderId(),
                                    orderId -> {
                                        shortEntryTraderIdParam(
                                                e,
                                                null,
                                                false
                                        );
                                    }
                            );
                        }
                    }
                }
@@ -445,7 +454,16 @@
                    List<GridElement> allLongOrders = GridElement.findAllLongOrders(shortEntryPrice);
                    if (CollUtil.isNotEmpty(allLongOrders)){
                        for (GridElement e : allLongOrders) {
                            executor.cancelOrder(e.getLongOrderId());
                            executor.cancelConditionalOrder(
                                    e.getLongOrderId(),
                                    orderId -> {
                                        shortEntryTraderIdParam(
                                                e,
                                                null,
                                                false
                                        );
                                    }
                            );
                        }
                    }
                }
@@ -1094,7 +1112,7 @@
                    ){
                        executor.placeConditionalEntryOrder(
                                downShortTraderParam.getEntryPrice(),
                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
                                negate(downShortTraderParam.getQuantity()),
                                orderId ->
                                {
@@ -1231,7 +1249,7 @@
                    ){
                        executor.placeConditionalEntryOrder(
                                downLongTraderParam.getEntryPrice(),
                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                config.getQuantity(),
                                orderId ->
                                {