From ef00aeb456a54c7a98b71617fb7e46e56d02aa78 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 29 Dec 2025 10:07:58 +0800
Subject: [PATCH] refactor(okxNewPrice): 重构止损订单处理逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategyTest.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategyTest.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategyTest.java
index b49ed8a..a085307 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategyTest.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategyTest.java
@@ -42,14 +42,38 @@
}
// 模拟上涨趋势
+// for (int i = 0; i < 50; i++) {
+// BigDecimal newPrice = new BigDecimal("125.00").subtract(new BigDecimal(i));
+// prices.add(newPrice);
+//
+// MacdMaStrategy.TradingOrder order = strategy.generateTradingOrder(prices);
+//
+// System.out.printf("价格: %.2f, 交易指令: %s\n",
+// newPrice.doubleValue(),
+// order != null ? order.toString() : "无交易指令");
+// }
+
+ // 模拟上涨趋势
for (int i = 0; i < 50; i++) {
BigDecimal newPrice = new BigDecimal("125.00").add(new BigDecimal(i));
prices.add(newPrice);
MacdMaStrategy.TradingOrder order = strategy.generateTradingOrder(prices);
- System.out.printf("价格: %.2f, 当前持仓: %s, 交易指令: %s\n",
- newPrice.doubleValue(), strategy.getCurrentPosition().name(),
+ System.out.printf("价格: %.2f, 交易指令: %s\n",
+ newPrice.doubleValue(),
+ order != null ? order.toString() : "无交易指令");
+ }
+
+ // 模拟上涨趋势
+ for (int i = 0; i < 50; i++) {
+ BigDecimal newPrice = new BigDecimal("175.00").subtract(new BigDecimal(i));
+ prices.add(newPrice);
+
+ MacdMaStrategy.TradingOrder order = strategy.generateTradingOrder(prices);
+
+ System.out.printf("价格: %.2f, 交易指令: %s\n",
+ newPrice.doubleValue(),
order != null ? order.toString() : "无交易指令");
}
}
@@ -75,8 +99,8 @@
MacdMaStrategy.TradingOrder order = strategy.generateTradingOrder(prices);
- System.out.printf("价格: %.2f, 当前持仓: %s, 交易指令: %s\n",
- newPrice.doubleValue(), strategy.getCurrentPosition().name(),
+ System.out.printf("价格: %.2f, 交易指令: %s\n",
+ newPrice.doubleValue(),
order != null ? order.toString() : "无交易指令");
}
}
@@ -104,8 +128,8 @@
MacdMaStrategy.TradingOrder order = strategy.generateTradingOrder(prices);
- System.out.printf("价格: %.2f, 当前持仓: %s, 交易指令: %s\n",
- newPrice.doubleValue(), strategy.getCurrentPosition().name(),
+ System.out.printf("价格: %.2f, 交易指令: %s\n",
+ newPrice.doubleValue(),
order != null ? order.toString() : "无交易指令");
}
}
@@ -132,8 +156,8 @@
MacdMaStrategy.TradingOrder order = strategy.generateTradingOrder(prices);
- System.out.printf("价格: %.2f, 当前持仓: %s, 交易指令: %s\n",
- newPrice.doubleValue(), strategy.getCurrentPosition().name(),
+ System.out.printf("价格: %.2f, 交易指令: %s\n",
+ newPrice.doubleValue(),
order != null ? order.toString() : "无交易指令");
}
@@ -146,8 +170,8 @@
MacdMaStrategy.TradingOrder order = strategy.generateTradingOrder(prices);
- System.out.printf("价格: %.2f, 当前持仓: %s, 交易指令: %s\n",
- newPrice.doubleValue(), strategy.getCurrentPosition().name(),
+ System.out.printf("价格: %.2f, 交易指令: %s\n",
+ newPrice.doubleValue(),
order != null ? order.toString() : "无交易指令");
}
}
@@ -184,13 +208,10 @@
MacdMaStrategy.TradingOrder order = strategy.generateTradingOrder(prices);
- System.out.printf("价格: %.2f, 当前持仓: %s, 交易指令: %s\n",
- newPrice.doubleValue(), strategy.getCurrentPosition().name(),
+ System.out.printf("价格: %.2f, 交易指令: %s\n",
+ newPrice.doubleValue(),
order != null ? order.toString() : "无交易指令");
- if (strategy.getCurrentPosition() == MacdMaStrategy.PositionType.NONE) {
- break;
- }
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1