From 081ed1a024eda884dbf52e44d32b32f240d3745f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 21:21:19 +0800
Subject: [PATCH] fix(okxNewPrice): 优化订单状态更新逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 3f18154..0cc6afa 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
@@ -55,14 +55,14 @@
@Override
public String caoZuo() {
log.info("开始执行操作CaoZuoServiceImpl......");
- String outStr = (String) redisUtils.get(instrumentsOutKey);
- if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
- log.error("止损过了......冷静一下，等待下次入场......");
- return null;
- }
// 获取合约执行操作状态
String state = (String) redisUtils.get(instrumentsStateKey);
+ String outStr = (String) redisUtils.get(instrumentsOutKey);
+ if (OrderParamEnums.OUT_YES.getValue().equals(outStr) && OrderParamEnums.STATE_3.getValue().equals(state)){
+ log.error("止损过了......冷静一下，等待下次入场......");
+ return null;
+ }
if (OrderParamEnums.STATE_4.getValue().equals(state)) {
log.error("操作下单中，等待......");
return OrderParamEnums.ORDERING.getValue();
@@ -145,6 +145,14 @@
side = OrderParamEnums.BUY.getValue();
redisUtils.set(positionsOrderPriceKey, String.valueOf(kaiCang.getValue()), 0);
} else {
+ //判断是否加仓（当前持仓过小，可以加仓）
+ boolean isAddCang = doAddCang();
+ log.info("加仓过程中发现持仓过小 ：{}",isAddCang);
+ if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
+ return OrderParamEnums.BUY.getValue();
+ }
log.info("未触发加仓......，等待");
}
} else if (avgPx.compareTo(markPx) < 0) {
@@ -173,9 +181,11 @@
return OrderParamEnums.SELL.getValue();
}else{
//判断是否加仓（当前持仓过小，可以加仓）
- boolean isAddCang = doAddCang(imrValue);
- log.info("减仓过程中没有收获，发现是持仓过小 ：{}",isAddCang);
+ boolean isAddCang = doAddCang();
+ log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
return OrderParamEnums.BUY.getValue();
}
log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
@@ -189,11 +199,12 @@
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.SELL.getValue();
}else{
-
//判断是否加仓（当前持仓过小，可以加仓）
- boolean isAddCang = doAddCang(imrValue);
- log.info("减仓过程中没有收获，发现是持仓过小 ：{}",isAddCang);
+ boolean isAddCang = doAddCang();
+ log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
return OrderParamEnums.BUY.getValue();
}
log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
@@ -218,7 +229,9 @@
}
}
- private boolean doAddCang(BigDecimal imrValue) {
+ private boolean doAddCang() {
+ String imr = (String) redisUtils.get(positionsImrKey);
+ BigDecimal imrValue = new BigDecimal(StrUtil.isBlank(imr) ? "0" : imr);
String everyTimeUsdt = (String) redisUtils.get(AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":everyTimeUsdt");
BigDecimal everyTimeUsdtValue = new BigDecimal(everyTimeUsdt);
return everyTimeUsdtValue.compareTo(imrValue) >= 0;
--
Gitblit v1.9.1