From 31db00c689b04ff32b2abe3c729b693626291acb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Dec 2025 16:41:37 +0800
Subject: [PATCH] fix(okxNewPrice): 优化减仓逻辑并增强错误处理
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 161 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 102 insertions(+), 59 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 3a42d27..0f26e18 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
@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.concurrent.PriorityBlockingQueue;
/**
@@ -48,34 +49,6 @@
log.error("账户没有钱，请充值......");
return null;
}
-
- // 系统设置的开关，等于冷静中，则代表不开仓
- String outStr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.OUT.name());
- if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
- log.error("冷静中，不允许下单......");
- return null;
- }
-
- // 判断当前是否有正在进行的订单操作
- String state = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.STATE.name());
- log.info(OrderParamEnums.getNameByValue(state));
- if (OrderParamEnums.STATE_4.getValue().equals(state)){
- log.warn("正在下单中，等待下单结束...");
- return null;
- }
- if (OrderParamEnums.STATE_3.getValue().equals(state)){
- log.error("冷静中，不允许下单......");
- return null;
- }
- if (OrderParamEnums.STATE_2.getValue().equals(state)){
- log.error("账户紧张扛仓......");
- return null;
- }
- if (OrderParamEnums.STATE_0.getValue().equals(state)){
- log.error("参数异常，不允许开仓......");
- return null;
- }
-
/**
* 判断止损抗压
*/
@@ -105,6 +78,35 @@
}
}
+ // 系统设置的开关，等于冷静中，则代表不开仓
+ String outStr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.OUT.name());
+ if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
+ log.error("冷静中，不允许下单......");
+ return null;
+ }
+
+ // 判断当前是否有正在进行的订单操作
+ String state = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.STATE.name());
+ log.info(OrderParamEnums.getNameByValue(state));
+ if (OrderParamEnums.STATE_4.getValue().equals(state)){
+ log.warn("正在下单中，等待下单结束...");
+ return null;
+ }
+ if (OrderParamEnums.STATE_3.getValue().equals(state)){
+ log.error("冷静中，不允许下单......");
+ return null;
+ }
+ if (OrderParamEnums.STATE_2.getValue().equals(state)){
+ log.error("账户紧张扛仓......");
+ return null;
+ }
+ if (OrderParamEnums.STATE_0.getValue().equals(state)){
+ log.error("参数异常，不允许开仓......");
+ return null;
+ }
+
+
+
if (PositionsWs.POSITIONSWSMAP.get("pos") == null){
log.error("没有获取到持仓信息，等待初始化......");
return null;
@@ -112,10 +114,18 @@
BigDecimal pos = PositionsWs.POSITIONSWSMAP.get("pos");
if (BigDecimal.ZERO.compareTo( pos) >= 0) {
log.error("持仓数量为零，进行初始化订单");
- WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
- return OrderParamEnums.INIT.getValue();
+ boolean flag = WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
+ if ( flag){
+ return OrderParamEnums.INIT.getValue();
+ }else{
+ return null;
+ }
}
// 判断是否保证金超标
+ if (PositionsWs.POSITIONSWSMAP.get("imr") == null){
+ log.error("没有获取到持仓信息，等待初始化......");
+ return null;
+ }
BigDecimal ordFrozImr = PositionsWs.POSITIONSWSMAP.get("imr");
BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.ACCOUNTWSMAP.get(CoinEnums.TOTAL_ORDER_USDT.name()));
if (ordFrozImr.compareTo(totalOrderUsdt) >= 0){
@@ -149,8 +159,16 @@
DescBigDecimal kaiCang = queueKaiCang.peek();
if (kaiCang != null && markPx.compareTo(kaiCang.getValue()) <= 0 && avgPx.compareTo(kaiCang.getValue()) >= 0) {
log.info("开始加仓...开仓队列价格大于当前价格{}>{}", kaiCang.getValue(), markPx);
- WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
- return OrderParamEnums.BUY.getValue();
+ boolean orderPriceFlag = WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice", String.valueOf(markPx));
+ boolean stateFlag = WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
+ boolean buyCntTimeFlag = buyCntTimeEvent(avgPx, markPx);
+ if (orderPriceFlag && stateFlag && buyCntTimeFlag){
+ log.info("加仓参数准备成功......");
+ return OrderParamEnums.BUY.getValue();
+ }else{
+ log.error("加仓参数准备失败......");
+ return null;
+ }
} else {
log.info("未触发加仓......，等待");
return OrderParamEnums.HOLDING.getValue();
@@ -165,33 +183,50 @@
AscBigDecimal pingCang = queuePingCang.peek();
if (pingCang != null && markPx.compareTo(pingCang.getValue()) >= 0 && avgPx.compareTo(pingCang.getValue()) < 0) {
log.info("开始减仓...平仓队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
+ boolean orderPriceFlag = WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice", String.valueOf(markPx));
+ if (orderPriceFlag){
+ // 判断当前是否盈利
+ BigDecimal uplValue = PositionsWs.POSITIONSWSMAP.get("upl");
+ BigDecimal imr = PositionsWs.POSITIONSWSMAP.get("imr");
+ BigDecimal realizedPnlValue = PositionsWs.POSITIONSWSMAP.get("realizedPnl");
+ String pingCangImr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.PING_CANG_SHOUYI.name());
+ BigDecimal imrValue = imr.multiply(new BigDecimal(pingCangImr));
- // 判断当前是否盈利
- BigDecimal uplValue = PositionsWs.POSITIONSWSMAP.get("upl");
- BigDecimal imr = PositionsWs.POSITIONSWSMAP.get("imr");
- BigDecimal realizedPnlValue = PositionsWs.POSITIONSWSMAP.get("realizedPnl");
- String pingCangImr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.PING_CANG_SHOUYI.name());
- BigDecimal imrValue = imr.multiply(new BigDecimal(pingCangImr));
-
- 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);
- WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
- return OrderParamEnums.SELL.getValue();
- }else{
- log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
- return OrderParamEnums.HOLDING.getValue();
+ 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);
+ boolean stateFlag = WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
+ if (stateFlag){
+ log.info("减仓参数准备成功......");
+ return OrderParamEnums.SELL.getValue();
+ }else{
+ log.error("减仓参数准备失败......");
+ return null;
+ }
+ }else{
+ log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
+ return OrderParamEnums.HOLDING.getValue();
+ }
+ }else {
+ if (uplValue.compareTo(imrValue) >= 0) {
+ log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue);
+ boolean stateFlag = WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
+ if (stateFlag){
+ log.info("减仓参数准备成功......");
+ return OrderParamEnums.SELL.getValue();
+ }else{
+ log.error("减仓参数准备失败......");
+ return null;
+ }
+ }else{
+ log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
+ return OrderParamEnums.HOLDING.getValue();
+ }
}
- }else {
- if (uplValue.compareTo(imrValue) >= 0) {
- log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue);
- WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_4.getValue());
- return OrderParamEnums.SELL.getValue();
- }else{
- log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
- return OrderParamEnums.HOLDING.getValue();
- }
+ }else{
+ log.error("减仓参数准备失败......");
+ return null;
}
} else {
log.info("未触发减仓......，等待");
@@ -199,13 +234,21 @@
} else {
log.info("价格波动较小......，等待");
}
- return OrderParamEnums.HOLDING.getValue();
+ return null;
} catch (NumberFormatException e) {
log.error("解析价格失败，请检查Redis中的值是否合法", e);
- return OrderParamEnums.HOLDING.getValue();
+ return null;
}
}
+ private boolean buyCntTimeEvent(BigDecimal avgPx, BigDecimal markPx){
+ //判断当前价格和开仓价格直接间隔除以间距，取整，获取的数量是否大于等于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);
+ return WsMapBuild.saveStringToMap(TradeOrderWs.TRADEORDERWSMAP, "buyCntTime",String.valueOf(divide));
+ }
+
/**
* 根据订单价格更新开仓和平仓队列的内容。
* 若该价格不在对应队列中则加入；若已存在，则从队列中移除。
--
Gitblit v1.9.1