fix(gateApi): 修复网格交易服务中的空指针异常

Administrator

2026-07-17 0f2573b4799e98b1ece7f1e0b8e008cf2ab37dca

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

@@ -675,9 +675,11 @@
                for (int i = 0; i < shortTpCount; i++) {
                    int tpGridId = shortGridElement.getId() - 2 * (i + 1);
                    GridElement tpElem = GridElement.findById(tpGridId);
                    if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
                    // 用 takeProfitPlaced 做同步标记，避免异步回调未执行时重复挂单
                    if (tpElem == null || tpElem.getShortTraderParam().isTakeProfitPlaced()) {
                        continue;
                    }
                    tpElem.getShortTraderParam().setTakeProfitPlaced(true);
                    BigDecimal tpPrice = tpElem.getGridPrice();
                    int finalTpGridId = tpGridId;
                    executor.placeTakeProfit(
@@ -741,9 +743,11 @@
                for (int i = 0; i < longTpCount; i++) {
                    int tpGridId = longGridElement.getId() + 2 * (i + 1);
                    GridElement tpElem = GridElement.findById(tpGridId);
                    if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
                    // 用 takeProfitPlaced 做同步标记，避免异步回调未执行时重复挂单
                    if (tpElem == null || tpElem.getLongTraderParam().isTakeProfitPlaced()) {
                        continue;
                    }
                    tpElem.getLongTraderParam().setTakeProfitPlaced(true);
                    BigDecimal tpPrice = tpElem.getGridPrice();
                    int finalTpGridId = tpGridId;
                    executor.placeTakeProfit(
@@ -1217,7 +1221,8 @@
                                    });
                                }
                            }
                            cancelCursor = GridElement.findById(cancelCursor.getUpId());
                            Integer nextUpId = cancelCursor.getUpId();
                            cancelCursor = nextUpId != null ? GridElement.findById(nextUpId) : null;
                        }
//                        log.info("[Gate-2] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
                        if (!newEntryGrid.isHasLongOrder()) {
@@ -1271,7 +1276,8 @@
                                    });
                                }
                            }
                            cancelCursor = GridElement.findById(cancelCursor.getDownId());
                            Integer nextDownId = cancelCursor.getDownId();
                            cancelCursor = nextDownId != null ? GridElement.findById(nextDownId) : null;
                        }
//                        log.info("[Gate-4] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
                        if (!newEntryGrid.isHasShortOrder()){
@@ -1592,6 +1598,7 @@
        for (GridElement e : config.getGridElements()) {
            String tpId = e.getLongTakeProfitOrderId();
            if (tpId != null) {
                e.getLongTraderParam().setTakeProfitPlaced(false);
                e.setLongTakeProfitOrderId(null);
                executor.cancelConditionalOrder(tpId, oid -> {});
            }
@@ -1611,6 +1618,7 @@
        for (GridElement e : config.getGridElements()) {
            String tpId = e.getShortTakeProfitOrderId();
            if (tpId != null) {
                e.getShortTraderParam().setTakeProfitPlaced(false);
                e.setShortTakeProfitOrderId(null);
                executor.cancelConditionalOrder(tpId, oid -> {});
            }