From 90ae4f1fdad2be2720945e0f1474c971a0fdf1a6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Dec 2025 10:00:09 +0800
Subject: [PATCH] fix(okxWs): 调整账户与持仓状态设置逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 70 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 34 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 107fc4a..eb85417 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
@@ -100,7 +100,7 @@
BigDecimal pos = PositionsWs.POSITIONSWSMAP.get("pos");
if (BigDecimal.ZERO.compareTo( pos) >= 0) {
log.error("持仓数量为零，进行初始化订单");
- return OrderParamEnums.INIT.getValue();
+ return null;
}
// 判断是否保证金超标
if (PositionsWs.POSITIONSWSMAP.get("imr") == null){
@@ -164,13 +164,11 @@
log.info("开始减仓...平仓队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
// 手续费
BigDecimal feeValue = PositionsWs.POSITIONSWSMAP.get("fee").multiply(new BigDecimal("2"));
- // 资金费用
- BigDecimal fundingFeeValue = PositionsWs.POSITIONSWSMAP.get("fundingFee");
//未实现收益
BigDecimal uplValue = PositionsWs.POSITIONSWSMAP.get("upl");
//已实现收益
BigDecimal realizedPnlValue = PositionsWs.POSITIONSWSMAP.get("realizedPnl");
- realizedPnlValue = realizedPnlValue.add(feeValue).add(fundingFeeValue);
+ realizedPnlValue = realizedPnlValue.add(feeValue);
//持仓保证金
BigDecimal imr = PositionsWs.POSITIONSWSMAP.get("imr");
@@ -180,20 +178,20 @@
if (realizedPnlValue.compareTo(BigDecimal.ZERO) <= 0) {
BigDecimal realizedPnlValueZheng = realizedPnlValue.multiply(new BigDecimal("-1"));
if (uplValue.compareTo(realizedPnlValue) > 0 && uplValue.compareTo(imrValue.add(realizedPnlValueZheng)) >= 0) {
- log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue);
+ log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue.add(realizedPnlValueZheng));
WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice", String.valueOf(markPx));
return OrderParamEnums.SELL.getValue();
}else{
- log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
+ log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue.add(realizedPnlValueZheng));
return OrderParamEnums.HOLDING.getValue();
}
}else {
- if (uplValue.compareTo(imrValue) >= 0) {
+ if (uplValue.compareTo(imrValue.add(feeValue)) >= 0) {
WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice", String.valueOf(markPx));
- log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue);
+ log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue.add(feeValue));
return OrderParamEnums.SELL.getValue();
}else{
- log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
+ log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue.add(feeValue));
return OrderParamEnums.HOLDING.getValue();
}
}
@@ -214,7 +212,11 @@
//判断当前价格和开仓价格直接间隔除以间距，取整，获取的数量是否大于等于0，如果大于0，则下单基础张数*倍数
String buyCntTime = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.BUY_CNT_TIME.name());
BigDecimal subtract = avgPx.subtract(markPx);
- BigDecimal divide = subtract.divide(new BigDecimal(buyCntTime), 0, RoundingMode.DOWN).add(BigDecimal.ONE);
+ BigDecimal divide = subtract.divide(new BigDecimal(buyCntTime), 0, RoundingMode.DOWN);
+ if (divide.compareTo(BigDecimal.ZERO) <= 0){
+ log.warn("加仓次数间隔时间小于0，不加仓");
+ return false;
+ }
return WsMapBuild.saveStringToMap(TradeOrderWs.TRADEORDERWSMAP, "buyCntTime",String.valueOf(divide));
}
@@ -246,34 +248,34 @@
queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
// 打印开仓队列
- StringBuilder kaiCangStr = new StringBuilder();
- kaiCangStr.append("开仓队列: [");
- boolean first = true;
- for (DescBigDecimal item : queueKaiCang) {
- if (!first) {
- kaiCangStr.append(", ");
- }
- kaiCangStr.append(item.getValue());
- first = false;
- }
- kaiCangStr.append("]");
- log.info(kaiCangStr.toString());
+// StringBuilder kaiCangStr = new StringBuilder();
+// kaiCangStr.append("开仓队列: [");
+// boolean first = true;
+// for (DescBigDecimal item : queueKaiCang) {
+// if (!first) {
+// kaiCangStr.append(", ");
+// }
+// kaiCangStr.append(item.getValue());
+// first = false;
+// }
+// kaiCangStr.append("]");
+// log.info(kaiCangStr.toString());
// 删除比该价格小的数据
queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
// 打印平仓队列
- StringBuilder pingCangStr = new StringBuilder();
- pingCangStr.append("平仓队列: [");
- first = true;
- for (AscBigDecimal item : queuePingCang) {
- if (!first) {
- pingCangStr.append(", ");
- }
- pingCangStr.append(item.getValue());
- first = false;
- }
- pingCangStr.append("]");
- log.info(pingCangStr.toString());
+// StringBuilder pingCangStr = new StringBuilder();
+// pingCangStr.append("平仓队列: [");
+// first = true;
+// for (AscBigDecimal item : queuePingCang) {
+// if (!first) {
+// pingCangStr.append(", ");
+// }
+// pingCangStr.append(item.getValue());
+// first = false;
+// }
+// pingCangStr.append("]");
+// log.info(pingCangStr.toString());
}
}
--
Gitblit v1.9.1