From fa7d25e98db0e6cb763d304b95e6a943f43ac240 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Dec 2025 13:44:06 +0800
Subject: [PATCH] fix(okxNewPrice): 修复持仓为零时返回值并增加日志输出
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
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..4a84985 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
@@ -130,7 +130,7 @@
BigDecimal pos = PositionsWs.getAccountMap(positionAccountName).get("pos");
if (BigDecimal.ZERO.compareTo( pos) >= 0) {
log.error("持仓数量为零，进行初始化订单");
- return null;
+ return OrderParamEnums.INIT.getValue();
}
// 判断是否保证金超标
if (PositionsWs.getAccountMap(positionAccountName).get("imr") == null){
@@ -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);
@@ -368,8 +370,11 @@
private boolean buyCntTimeLongEvent(String accountName, BigDecimal avgPx, BigDecimal markPx){
//判断当前价格和开仓价格直接间隔除以间距，取整，获取的数量是否大于等于0，如果大于0，则下单基础张数*倍数
String buyCntTime = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_TIME.name());
+ log.info("倍数次数间隔{}", buyCntTime);
BigDecimal subtract = avgPx.subtract(markPx);
+ log.info("倍数价格差距{}", subtract);
BigDecimal divide = subtract.divide(new BigDecimal(buyCntTime), 0, RoundingMode.DOWN).add(BigDecimal.ONE);
+ log.info("倍数次数{}", divide);
if (divide.compareTo(BigDecimal.ZERO) <= 0){
log.warn("加仓次数间隔时间小于0，不加仓");
return false;
@@ -380,8 +385,11 @@
private boolean buyCntTimeShortEvent(String accountName, BigDecimal avgPx, BigDecimal markPx){
//判断当前价格和开仓价格直接间隔除以间距，取整，获取的数量是否大于等于0，如果大于0，则下单基础张数*倍数
String buyCntTime = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_TIME.name());
+ log.info("倍数次数间隔{}", buyCntTime);
BigDecimal subtract = markPx.subtract(avgPx);
+ log.info("倍数价格差距{}", subtract);
BigDecimal divide = subtract.divide(new BigDecimal(buyCntTime), 0, RoundingMode.DOWN).add(BigDecimal.ONE);
+ log.info("倍数次数{}", divide);
if (divide.compareTo(BigDecimal.ZERO) <= 0){
log.warn("加仓次数间隔时间小于0，不加仓");
return false;
--
Gitblit v1.9.1