From 7419e72a3dc57355cbd9990cafa660281970ead5 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Dec 2025 13:03:10 +0800
Subject: [PATCH] feat(okxNewPrice): 修改策略操作接口以支持传入标记价格
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 14 ++++++++------
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoService.java | 4 ++--
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoService.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoService.java
index 367613b..0d700c3 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoService.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoService.java
@@ -7,7 +7,7 @@
String caoZuo(String accountName);
- String caoZuoLong(String accountName);
+ String caoZuoLong(String accountName,String markPx);
- String caoZuoShort(String accountName);
+ String caoZuoShort(String accountName,String markPx);
}
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
index 8c19308..82d8f92 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -150,9 +150,9 @@
return null;
}
if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide)){
- return caoZuoLong(accountName);
+ return caoZuoLong(accountName,markPx);
}else if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide)){
- return caoZuoShort(accountName);
+ return caoZuoShort(accountName,markPx);
}else{
log.error("账户未设置持仓方向......");
return null;
@@ -160,13 +160,14 @@
}
@Override
- public String caoZuoLong(String accountName) {
+ public String caoZuoLong(String accountName,String markPxStr) {
log.info("开始看涨执行操作CaoZuoServiceImpl......");
try {
String positionAccountName = PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_LONG.getCode());
// 获取标记价格和平均持仓价格
- BigDecimal markPx = PositionsWs.getAccountMap(positionAccountName).get("markPx");
+// BigDecimal markPx = PositionsWs.getAccountMap(positionAccountName).get("markPx");
+ BigDecimal markPx = new BigDecimal(markPxStr);
BigDecimal avgPx = PositionsWs.getAccountMap(positionAccountName).get("avgPx");
log.info("开仓价格: {}, 当前价格：{}，匹配队列中......", avgPx, markPx);
@@ -262,14 +263,15 @@
}
@Override
- public String caoZuoShort(String accountName) {
+ public String caoZuoShort(String accountName,String markPxStr) {
log.info("开始看空执行操作CaoZuoServiceImpl......");
try {
String positionAccountName = PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_SHORT.getCode());
// 获取标记价格和平均持仓价格
- BigDecimal markPx = PositionsWs.getAccountMap(positionAccountName).get("markPx");
+// BigDecimal markPx = PositionsWs.getAccountMap(positionAccountName).get("markPx");
+ BigDecimal markPx = new BigDecimal(markPxStr);
BigDecimal avgPx = PositionsWs.getAccountMap(positionAccountName).get("avgPx");
log.info("开仓价格: {}, 当前价格：{}，匹配队列中......", avgPx, markPx);
--
Gitblit v1.9.1