From 9fa3bded1ae93c1ab14fab02b4d271ead53dd8cc Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Dec 2025 16:13:55 +0800
Subject: [PATCH] fix(okxNewPrice): 修复账户可用保证金字段读取错误
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 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 77858e1..85e5f3c 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();
@@ -88,17 +88,17 @@
}
String uplStr = (String) redisUtils.get(positionsUplKey);
- if (StrUtil.isBlank(uplStr)){
+ //可使用的总保证金
+ String cashBalStrKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":cashBal";
+ String cashBalStr = (String) redisUtils.get(cashBalStrKey);
+ if (StrUtil.isBlank(cashBalStr) || StrUtil.isBlank(uplStr)){
return OrderParamEnums.INIT.getValue();
}
- //可使用的总保证金
- String totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";
- String totalOrderUsdt = (String) redisUtils.get(totalOrderUsdtKey);
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();
}
@@ -150,7 +150,6 @@
log.info("加仓过程中发现持仓过小 ：{}",isAddCang);
if (isAddCang){
log.info("触发加仓......，持仓过小");
- redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
return OrderParamEnums.BUY.getValue();
}
log.info("未触发加仓......，等待");
@@ -185,7 +184,6 @@
log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
if (isAddCang){
log.info("触发加仓......，持仓过小");
- redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
return OrderParamEnums.BUY.getValue();
}
log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
@@ -204,7 +202,6 @@
log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
if (isAddCang){
log.info("触发加仓......，持仓过小");
- redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
return OrderParamEnums.BUY.getValue();
}
log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
--
Gitblit v1.9.1