From dfd766139d37b0bd038288952cb24df76f4289f9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Dec 2025 17:38:56 +0800
Subject: [PATCH] feat(redis): 添加带延迟的Redis读取方法以提高数据一致性
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 0c34edd..68f6774 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
@@ -1,10 +1,7 @@
package com.xcong.excoin.modules.okxNewPrice.celue;
import cn.hutool.core.util.StrUtil;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.AccountWs;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.InstrumentsWs;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.PositionsWs;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.TradeOrderWs;
+import com.xcong.excoin.modules.okxNewPrice.okxWs.*;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.OrderParamEnums;
import com.xcong.excoin.modules.okxNewPrice.wangge.WangGeQueue;
@@ -54,15 +51,19 @@
*/
@Override
public String caoZuo() {
- log.info("开始执行操作CaoZuoServiceImpl......");
+ String state = (String) redisUtils.get(instrumentsStateKey);
+ log.info("开始执行操作CaoZuoServiceImpl......{}",state);
+
+ String live = (String) redisUtils.getWithDelay(TradeOrderWs.ORDERWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
+ if (!CoinEnums.ORDER_LIVE.getCode().equals( live)){
+ log.warn("正在下单中，等待下单结束...");
+ }
+ // 获取合约执行操作状态
String outStr = (String) redisUtils.get(instrumentsOutKey);
- if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
+ if (OrderParamEnums.OUT_YES.getValue().equals(outStr) && OrderParamEnums.STATE_3.getValue().equals(state)){
log.error("止损过了......冷静一下，等待下次入场......");
return null;
}
-
- // 获取合约执行操作状态
- String state = (String) redisUtils.get(instrumentsStateKey);
if (OrderParamEnums.STATE_4.getValue().equals(state)) {
log.error("操作下单中，等待......");
return OrderParamEnums.ORDERING.getValue();
@@ -88,17 +89,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();
}
@@ -228,7 +229,7 @@
private boolean doAddCang() {
String imr = (String) redisUtils.get(positionsImrKey);
- BigDecimal imrValue = new BigDecimal(imr).multiply(new BigDecimal(OrderParamEnums.PING_CANG_SHOUYI.getValue()));
+ 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