2 files modified
73 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java 59 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java 14 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -1127,18 +1127,22 @@
            return;
        }
        BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        // [Gate-BugFix] 防止与"仓位归零"重复下单:若该网格已有挂单则跳过
        if (!newEntryGrid.isHasLongOrder()) {
            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        // 累计止损张数 + 当前止损量作为追单size,不再依赖positionSize(避免WS竞态)
        accumulatedLongLossCount += Integer.parseInt(config.getQuantity());
        String size = String.valueOf(accumulatedLongLossCount + Integer.parseInt(config.getQuantity()));
        log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单",
                gridId, newEntryGridId, size);
            // 累计止损张数 + 当前止损量作为追单size,不再依赖positionSize(避免WS竞态)
            accumulatedLongLossCount += Integer.parseInt(config.getQuantity());
            String size = String.valueOf(accumulatedLongLossCount + Integer.parseInt(config.getQuantity()));
            log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单",
                    gridId, newEntryGridId, size);
        newEntryGrid.getLongTraderParam().setQuantity(size);
        placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
                FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
            newEntryGrid.getLongTraderParam().setQuantity(size);
            placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
        }else{
            log.warn("[Gate] 多仓止损触发 gridId:{}, 目标gridId:{}已有挂单,跳过重复下单", gridId, newEntryGridId);
        }
        int cancelGridId = gridId + 2;
        GridElement cancelGrid = GridElement.findById(cancelGridId);
@@ -1182,16 +1186,23 @@
            return;
        }
        BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        // [Gate-BugFix] 防止与"仓位归零"重复下单:若该网格已有挂单则跳过
        if (!newEntryGrid.isHasShortOrder()) {
            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
        // 累计止损张数 + 当前止损量作为追单size,不再依赖positionSize(避免WS竞态)
        accumulatedShortLossCount += Integer.parseInt(config.getQuantity());
        String size = String.valueOf(accumulatedShortLossCount + Integer.parseInt(config.getQuantity()));
        log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单",
                gridId, newEntryGridId, size);
        newEntryGrid.getShortTraderParam().setQuantity(size);
        placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
                FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
            // 累计止损张数 + 当前止损量作为追单size,不再依赖positionSize(避免WS竞态)
            accumulatedShortLossCount += Integer.parseInt(config.getQuantity());
            String size = String.valueOf(accumulatedShortLossCount + Integer.parseInt(config.getQuantity()));
            log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单",
                    gridId, newEntryGridId, size);
            newEntryGrid.getShortTraderParam().setQuantity(size);
            placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
        }else{
            log.warn("[Gate] 空仓止损触发 gridId:{}, 目标gridId:{}已有挂单,跳过重复下单", gridId, newEntryGridId);
        }
        int cancelGridId = gridId - 2;
@@ -1229,12 +1240,15 @@
                furthestSlId = e.getId();
            }
        }
        int interval  = 1;
        if (furthestSlId == 0) {
            furthestSlId = gridId;
            interval = 2;
        }
        log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
        for (int i = 0; i < filledQty; i++) {
            int newSlId = furthestSlId - i - 2;
            int newSlId = furthestSlId - i - interval;
            GridElement elem = GridElement.findById(newSlId);
            if (elem == null) {
                continue;
@@ -1262,12 +1276,15 @@
                furthestSlId = e.getId();
            }
        }
        int interval  = 1;
        if (furthestSlId == 0) {
            furthestSlId = gridId;
            interval = 2;
        }
        log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
        for (int i = 0; i < filledQty; i++) {
            int newSlId = furthestSlId + i + 2;
            int newSlId = furthestSlId + i + interval;
            GridElement elem = GridElement.findById(newSlId);
            if (elem == null) {
                continue;
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -58,17 +58,17 @@
        try {
            //实盘
            config = GateConfig.builder()
                    .apiKey("a2338398e00b7935104520e16be96918")
                    .apiSecret("9111d897f2346d5217619f2da76536632715fef4d7eb304c6c61e869a2a74e98")
                    .apiKey("dbf5cc322a0f3d6f308e143c494fb0b4")
                    .apiSecret("83cb291e21e62148ec99bc9adef493ee9f7fc195f2b9dc929466d70350ec58c3")
                    .contract("ETH_USDT")
                    .leverage("100")
                    .marginMode("CROSS")
                    .positionMode("dual")
                    .gridRate(new BigDecimal("0.0035"))
                    .expectedProfit(new BigDecimal("2.5"))
                    .maxLoss(new BigDecimal("1.5"))
                    .baseQuantity("1")
                    .quantity("1")
                    .gridRate(new BigDecimal("0.005"))
                    .expectedProfit(new BigDecimal("25"))
                    .maxLoss(new BigDecimal("15"))
                    .baseQuantity("10")
                    .quantity("10")
                    .maxPositionSize(2)
                    .priceScale(2)
                    .contractMultiplier(new BigDecimal("0.01"))