From 638ec3db42690a93e47db372136dda669da1d499 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Dec 2025 16:08:59 +0800
Subject: [PATCH] fix(okxNewPrice): 修复保证金和浮盈数据为空时的初始化问题
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 17 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 eca672a..9f0d0ef 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
@@ -37,6 +37,7 @@
// 构造Redis键名
final String coinCode = CoinEnums.HE_YUE.getCode();
final String instrumentsStateKey = InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + coinCode + ":state";
+ final String instrumentsOutKey = InstrumentsWs.INSTRUMENTSWS_CHANNEL+":" + coinCode+":out";
final String positionsMarkPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":markPx";
final String positionsAvgPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":avgPx";
final String positionsOrderPriceKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":orderPrice";
@@ -53,21 +54,22 @@
*/
@Override
public String caoZuo() {
- log.info("开始执行操作......");
- String pos = (String) redisUtils.get(positionsPosKey);
- if (StrUtil.isBlank(pos) || BigDecimal.ZERO.compareTo( new BigDecimal(pos)) <= 0) {
- log.error("未获取到持仓数量");
- return OrderParamEnums.INIT.getValue();
- }
+ log.info("开始执行操作CaoZuoServiceImpl......");
// 获取合约执行操作状态
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();
}
if (OrderParamEnums.STATE_3.getValue().equals(state)){
- log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
+ log.error("持仓盈亏超过下单总保证金，冷静止损......");
+ redisUtils.set(instrumentsOutKey, OrderParamEnums.OUT_YES.getValue(), 0);
return OrderParamEnums.OUT.getValue();
}
if (OrderParamEnums.STATE_2.getValue().equals(state)){
@@ -79,18 +81,24 @@
return OrderParamEnums.HOLDING.getValue();
}
- String uplStr = (String) redisUtils.get(positionsUplKey);
- if (StrUtil.isBlank(uplStr)){
+ String pos = (String) redisUtils.get(positionsPosKey);
+ if (StrUtil.isBlank(pos) || BigDecimal.ZERO.compareTo( new BigDecimal(pos)) >= 0) {
+ log.error("未获取到持仓数量");
return OrderParamEnums.INIT.getValue();
}
+
+ String uplStr = (String) redisUtils.get(positionsUplKey);
//可使用的总保证金
- String totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";
- String totalOrderUsdt = (String) redisUtils.get(totalOrderUsdtKey);
+ String cashBalStrKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":cashBalStr";
+ String cashBalStr = (String) redisUtils.get(cashBalStrKey);
+ if (StrUtil.isBlank(cashBalStr) || StrUtil.isBlank(uplStr)){
+ return OrderParamEnums.INIT.getValue();
+ }
BigDecimal upl = new BigDecimal(uplStr);
if (BigDecimal.ZERO.compareTo(upl) >= 0){
upl = upl.multiply(new BigDecimal("-1"));
-
- if (upl.compareTo(new BigDecimal(totalOrderUsdt)) >= 0) {
+ BigDecimal bigDecimal = new BigDecimal(cashBalStr).multiply(new BigDecimal(OrderParamEnums.ZHI_SUN.getValue()));
+ if (upl.compareTo(bigDecimal) >= 0) {
log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
return OrderParamEnums.OUT.getValue();
}
@@ -137,6 +145,13 @@
side = OrderParamEnums.BUY.getValue();
redisUtils.set(positionsOrderPriceKey, String.valueOf(kaiCang.getValue()), 0);
} else {
+ //判断是否加仓（当前持仓过小，可以加仓）
+ boolean isAddCang = doAddCang();
+ log.info("加仓过程中发现持仓过小 ：{}",isAddCang);
+ if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ return OrderParamEnums.BUY.getValue();
+ }
log.info("未触发加仓......，等待");
}
} else if (avgPx.compareTo(markPx) < 0) {
@@ -164,6 +179,13 @@
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.SELL.getValue();
}else{
+ //判断是否加仓（当前持仓过小，可以加仓）
+ boolean isAddCang = doAddCang();
+ log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
+ if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ return OrderParamEnums.BUY.getValue();
+ }
log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.HOLDING.getValue();
@@ -175,6 +197,13 @@
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.SELL.getValue();
}else{
+ //判断是否加仓（当前持仓过小，可以加仓）
+ boolean isAddCang = doAddCang();
+ log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
+ if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ return OrderParamEnums.BUY.getValue();
+ }
log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.HOLDING.getValue();
@@ -195,6 +224,14 @@
log.error("解析价格失败，请检查Redis中的值是否合法", e);
return OrderParamEnums.HOLDING.getValue();
}
+ }
+
+ 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;
}
/**
@@ -220,8 +257,8 @@
log.warn("无效的价格格式: {}", orderPrice);
return;
}
- // 删除比该价格大的数据（由于是降序队列，所以是删除value.compareTo(priceDecimal) < 0的元素）
- queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
+ // 删除比该价格大的数据
+ queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
// 打印开仓队列
StringBuilder kaiCangStr = new StringBuilder();
kaiCangStr.append("开仓队列: [");
@@ -236,8 +273,8 @@
kaiCangStr.append("]");
log.info(kaiCangStr.toString());
- // 删除比该价格小的数据（由于是升序队列，所以是删除value.compareTo(priceDecimal) > 0的元素）
- queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
+ // 删除比该价格小的数据
+ queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
// 打印平仓队列
StringBuilder pingCangStr = new StringBuilder();
--
Gitblit v1.9.1