Administrator
2026-07-17 9787ba2e4ea3d6299faaceb486df74d24be1fe7d
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -398,7 +398,8 @@
            return;
        }
        checkProfitAndReset();
        // 异步检查盈亏,避免 REST 调用阻塞 WS 心跳导致 Socket closed
        executor.submitTask(this::checkProfitAndReset);
        if (state == StrategyState.ACTIVE &&
                longActive == false &&
@@ -671,12 +672,15 @@
                int shortGridQty = Integer.parseInt(config.getQuantity());
                int shortTpCount = posSize > shortBaseQty ? (posSize - shortBaseQty) / shortGridQty : 0;
                int tpSpan = config.getTakeProfitGridSpan();
                for (int i = 0; i < shortTpCount; i++) {
                    int tpGridId = shortGridElement.getId() - 2 * (i + 1);
                    int tpGridId = shortGridElement.getId() - tpSpan * (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(
@@ -737,12 +741,15 @@
                int longGridQty = Integer.parseInt(config.getQuantity());
                int longTpCount = posSize > longBaseQty ? (posSize - longBaseQty) / longGridQty : 0;
                int tpSpan = config.getTakeProfitGridSpan();
                for (int i = 0; i < longTpCount; i++) {
                    int tpGridId = longGridElement.getId() + 2 * (i + 1);
                    int tpGridId = longGridElement.getId() + tpSpan * (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(
@@ -1206,7 +1213,7 @@
                        String quantity = String.valueOf((accumulatedLongLossCount + 1) * Integer.parseInt(config.getQuantity()));
                        // 向上遍历取消所有遗留多单(跳过基础入场网格0)
                        GridElement cancelCursor = GridElement.findById(newEntryGrid.getUpId());
                        while (cancelCursor != null && cancelCursor.getId() < 0) {
                        while (cancelCursor != null) {
                            if (cancelCursor.isHasLongOrder()) {
                                for (String longOrderId : new ArrayList<>(cancelCursor.getLongOrderIds())) {
                                    GridElement finalCancelCursor = cancelCursor;
@@ -1216,7 +1223,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()) {
@@ -1260,7 +1268,7 @@
                        String quantity = String.valueOf((accumulatedShortLossCount + 1) * Integer.parseInt(config.getQuantity()));
                        // 向下遍历取消所有遗留空单(跳过基础入场网格0)
                        GridElement cancelCursor = GridElement.findById(newEntryGrid.getDownId());
                        while (cancelCursor != null && cancelCursor.getId() > 0) {
                        while (cancelCursor != null) {
                            if (cancelCursor.isHasShortOrder()) {
                                for (String shortOrderId : new ArrayList<>(cancelCursor.getShortOrderIds())) {
                                    GridElement finalCancelCursor = cancelCursor;
@@ -1270,7 +1278,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()){
@@ -1591,6 +1600,7 @@
        for (GridElement e : config.getGridElements()) {
            String tpId = e.getLongTakeProfitOrderId();
            if (tpId != null) {
                e.getLongTraderParam().setTakeProfitPlaced(false);
                e.setLongTakeProfitOrderId(null);
                executor.cancelConditionalOrder(tpId, oid -> {});
            }
@@ -1610,6 +1620,7 @@
        for (GridElement e : config.getGridElements()) {
            String tpId = e.getShortTakeProfitOrderId();
            if (tpId != null) {
                e.getShortTraderParam().setTakeProfitPlaced(false);
                e.setShortTakeProfitOrderId(null);
                executor.cancelConditionalOrder(tpId, oid -> {});
            }