Administrator
2026-05-22 67939acc2d20ea34618013898154d9ff3fe37a74
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -571,11 +571,11 @@
                    null,
                    false
            );
            longEntryTraderIdParam(
                    byLongTakeProfitOrderId,
                    null,
                    false
            );
//            longEntryTraderIdParam(
//                    byLongTakeProfitOrderId,
//                    null,
//                    false
//            );
        }
        GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
        if (byShortTakeProfitOrderId != null){
@@ -584,11 +584,11 @@
                    null,
                    false
            );
            shortEntryTraderIdParam(
                    byShortTakeProfitOrderId,
                    null,
                    false
            );
//            shortEntryTraderIdParam(
//                    byShortTakeProfitOrderId,
//                    null,
//                    false
//            );
        }
        /**
@@ -597,6 +597,11 @@
        GridElement longGridElement = GridElement.findByLongOrderId(orderId);
        if (longGridElement != null) {
            if (longGridElement.isHasLongOrder()){
                longEntryTraderIdParam(
                        longGridElement,
                        null,
                        false
                );
                if (longGridElement.getLongTakeProfitOrderId() == null){
                    BigDecimal longTp = longGridElement.getLongTraderParam().getTakeProfitPrice();
                    if (longTp != null) {
@@ -620,6 +625,11 @@
        GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
        if (shortGridElement != null) {
            if (shortGridElement.isHasShortOrder()){
                shortEntryTraderIdParam(
                        shortGridElement,
                        null,
                        false
                );
                if (shortGridElement.getShortTakeProfitOrderId() == null){
                    BigDecimal shortTp = shortGridElement.getShortTraderParam().getTakeProfitPrice();
                    if (shortTp != null) {
@@ -1118,7 +1128,7 @@
            // 判断网格是否能开空仓,如果不能则跳过
            if (UpGridElement != null) {
                if (!UpGridElement.isHasShortOrder()) {
                if (!UpGridElement.isHasShortOrder() && shortEntryPrice.compareTo(newLongFirst) > 0) {
                    //挂空仓条件单
                    TraderParam upShortTraderParam = UpGridElement.getShortTraderParam();
@@ -1255,7 +1265,7 @@
            // 判断网格是否能开多仓,如果不能则跳过
            if (UpGridElement != null) {
                if (!UpGridElement.isHasLongOrder()) {
                if (!UpGridElement.isHasLongOrder() && longEntryPrice.compareTo(newLongFirst) < 0) {
                    //挂多仓条件单
                    TraderParam upLongTraderParam = UpGridElement.getLongTraderParam();
                    executor.placeConditionalEntryOrder(