From 56e585eb01d4ee22e81de71a3541cb615d8557fc Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Dec 2025 16:32:22 +0800
Subject: [PATCH] feat(okxNewPrice): 增加持仓初始化订单的异常处理
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 72 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 32 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 76437ba..2f265d4 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
@@ -49,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;
- }
-
/**
* 判断止损抗压
*/
@@ -106,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;
@@ -113,11 +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());
- buyCntTimeEvent(new BigDecimal(CoinEnums.BUY_CNT.name()),new BigDecimal(CoinEnums.BUY_CNT.name()));
- 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){
@@ -216,7 +224,7 @@
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);
- WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "buyCntTime",String.valueOf(divide));
+ WsMapBuild.saveStringToMap(TradeOrderWs.TRADEORDERWSMAP, "buyCntTime",String.valueOf(divide));
}
/**
--
Gitblit v1.9.1