From 8612a0259b4ed6459c06a8732f879184e82812f0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Dec 2025 09:54:33 +0800
Subject: [PATCH] fix(okxNewPrice): 修复账户和持仓状态初始化逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 16 +++++++++-------
1 files changed, 9 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 b401911..643a75f 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
@@ -66,8 +66,10 @@
if (StrUtil.isNotEmpty(wanggeName) && !wanggeName.equals(gridByPrice.name())){
log.error("正在止损老的网格仓位......");
WangGeListEnum oldWangge = WangGeListEnum.getByName(wanggeName);
- WsMapBuild.saveStringToMap(accountMap, CoinEnums.POSSIDE.name(), oldWangge.getFang_xiang());
- return OrderParamEnums.OUT.getValue();
+ if (oldWangge != null){
+ WsMapBuild.saveStringToMap(accountMap, CoinEnums.POSSIDE.name(), oldWangge.getFang_xiang());
+ return OrderParamEnums.OUT.getValue();
+ }
}
String posSide = gridByPrice.getFang_xiang();
log.info("仓位方向: {}", posSide);
@@ -127,7 +129,7 @@
BigDecimal pos = PositionsWs.getAccountMap(positionAccountName).get("pos");
if (BigDecimal.ZERO.compareTo( pos) >= 0) {
log.error("持仓数量为零，进行初始化订单");
- return OrderParamEnums.INIT.getValue();
+ return null;
}
// 判断是否保证金超标
if (PositionsWs.getAccountMap(positionAccountName).get("imr") == null){
@@ -185,7 +187,7 @@
}
DescBigDecimal kaiCang = queueKaiCang.peek();
if (kaiCang != null && markPx.compareTo(kaiCang.getValue()) <= 0 && avgPx.compareTo(kaiCang.getValue()) >= 0) {
- log.info("开始加仓...开仓队列价格大于当前价格{}>{}", kaiCang.getValue(), markPx);
+ log.info("开始加仓...下限队列价格大于当前价格{}>{}", kaiCang.getValue(), markPx);
WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
boolean buyCntTimeFlag = buyCntTimeLongEvent(accountName, avgPx, markPx);
if (buyCntTimeFlag){
@@ -208,7 +210,7 @@
}
AscBigDecimal pingCang = queuePingCang.peek();
if (pingCang != null && avgPx.compareTo(pingCang.getValue()) < 0) {
- log.info("开始减仓...平仓队列价格大于当前价格{}<={}", pingCang.getValue(), avgPx);
+ log.info("开始减仓...上限队列价格大于开仓价格{}>{}", pingCang.getValue(), avgPx);
// 手续费
BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee").multiply(new BigDecimal("2"));
//未实现收益
@@ -285,7 +287,7 @@
}
DescBigDecimal kaiCang = queueKaiCang.peek();
if (kaiCang != null && avgPx.compareTo(kaiCang.getValue()) >= 0) {
- log.info("开始减仓...减仓队列价格小于开仓价格{}>{}", kaiCang.getValue(), avgPx);
+ log.info("开始减仓...下限队列价格小于开仓价格{}<{}", kaiCang.getValue(), avgPx);
// 手续费
BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee").multiply(new BigDecimal("2"));
@@ -333,7 +335,7 @@
}
AscBigDecimal pingCang = queuePingCang.peek();
if (pingCang != null && markPx.compareTo(pingCang.getValue()) >= 0 && avgPx.compareTo(pingCang.getValue()) < 0) {
- log.info("开始加仓...加仓队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
+ log.info("开始加仓...上限队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
boolean buyCntTimeFlag = buyCntTimeShortEvent(accountName, avgPx, markPx);
if (buyCntTimeFlag){
--
Gitblit v1.9.1