Administrator
7 hours ago 7ff32aba4d8d763affa76c68260008bd45605f40
fix(trade): 修复网格交易逻辑并更新生产配置

- 在网格交易服务中添加仓位大小限制条件,防止过度开仓
- 修改期货订单设置,使用触发价格而非零价格,并将订单类型改为GTC
- 更新Gate WebSocket客户端管理器中的生产环境配置参数
- 更改网格比率从0.003到0.005,调整生产环境标识为true
- 注释掉测试环境配置代码块,启用正确的生产环境API密钥
3 files modified
52 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java 42 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -662,7 +662,8 @@
                    null);
            if (newShortFirst.compareTo(shortEntryPrice) > 0
                    && newShortFirst.compareTo(longEntryPrice) < 0) {
                    && newShortFirst.compareTo(longEntryPrice) < 0
                    && longPositionSize.compareTo(new BigDecimal("3")) < 0) {
                BigDecimal reverseLongTp = newShortFirst.add(step).setScale(1, RoundingMode.HALF_UP);
                longTakeProfitQueue.add(reverseLongTp);
                longTakeProfitQueue.sort(BigDecimal::compareTo);
@@ -769,7 +770,8 @@
                    null);
            if (newLongFirst.compareTo(shortEntryPrice) > 0
                    && newLongFirst.compareTo(longEntryPrice) < 0) {
                    && newLongFirst.compareTo(longEntryPrice) < 0
                    && shortPositionSize.compareTo(new BigDecimal("3")) < 0) {
                BigDecimal reverseShortTp = newLongFirst.subtract(step).setScale(1, RoundingMode.HALF_UP);
                shortTakeProfitQueue.add(reverseShortTp);
                shortTakeProfitQueue.sort((a, b) -> b.compareTo(a));
src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java
@@ -358,8 +358,8 @@
        FuturesInitialOrder initial = new FuturesInitialOrder();
        initial.setContract(contract);
        initial.setSize(Long.parseLong(size));
        initial.setPrice("0");
        initial.setTif(FuturesInitialOrder.TifEnum.IOC);
        initial.setPrice(triggerPrice.toString());
        initial.setTif(FuturesInitialOrder.TifEnum.GTC);
        initial.setReduceOnly(true);
        FuturesPriceTriggeredOrder order = new FuturesPriceTriggeredOrder();
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -49,39 +49,39 @@
        try {
            //测试盘
//            config = GateConfig.builder()
//                    .apiKey("d90ca272391992b8e74f8f92cedb21ec")
//                    .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
//                    .contract("ETH_USDT")
//                    .leverage("100")
//                    .marginMode("CROSS")
//                    .positionMode("dual")
//                    .gridRate(new BigDecimal("0.003"))
//                    .overallTp(new BigDecimal("5"))
//                    .maxLoss(new BigDecimal("15"))
//                    .quantity("1")
//                    .contractMultiplier(new BigDecimal("0.01"))
//                    .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
//                    .isProduction(false)
//                    .reopenMaxRetries(3)
//                    .build();
            //实盘
            config = GateConfig.builder()
                    .apiKey("d90ca272391992b8e74f8f92cedb21ec")
                    .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
                    .apiKey("865371cdaccd5d238aceb06a55f0143a")
                    .apiSecret("49589c30dfdc3acba007eed445a94990c4b0aa5faac9843e32defdd7371f5a50")
                    .contract("ETH_USDT")
                    .leverage("100")
                    .marginMode("CROSS")
                    .positionMode("dual")
                    .gridRate(new BigDecimal("0.003"))
                    .gridRate(new BigDecimal("0.005"))
                    .overallTp(new BigDecimal("5"))
                    .maxLoss(new BigDecimal("15"))
                    .quantity("1")
                    .contractMultiplier(new BigDecimal("0.01"))
                    .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
                    .isProduction(false)
                    .isProduction(true)
                    .reopenMaxRetries(3)
                    .build();
//            //实盘
//            config = GateConfig.builder()
//                    .apiKey("865371cdaccd5d238aceb06a55f0143a")
//                    .apiSecret("49589c30dfdc3acba007eed445a94990c4b0aa5faac9843e32defdd7371f5a50")
//                    .contract("ETH_USDT")
//                    .leverage("100")
//                    .marginMode("CROSS")
//                    .positionMode("dual")
//                    .gridRate(new BigDecimal("0.0035"))
//                    .overallTp(new BigDecimal("1"))
//                    .maxLoss(new BigDecimal("15"))
//                    .quantity("1")
//                    .contractMultiplier(new BigDecimal("0.01"))
//                    .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
//                    .isProduction(true)
//                    .reopenMaxRetries(3)
//                    .build();
            // 1. 初始化交易服务:查用户ID → 切持仓模式 → 清条件单 → 平已有仓位 → 设杠杆
            gridTradeService = new GateGridTradeService(config);