From a7d61fcdf24ab8e459f53761b632072df00251b6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Dec 2025 19:44:42 +0800
Subject: [PATCH] fix(okxNewPrice): 更新订单成交后的持仓计算逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java | 128 ++++++------------------------------------
1 files changed, 19 insertions(+), 109 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
index 3a53134..dad2031 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
@@ -1,20 +1,17 @@
package com.xcong.excoin.modules.okxNewPrice.okxWs;
-import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.OrderParamEnums;
import com.xcong.excoin.modules.okxNewPrice.okxpi.MallUtils;
+import com.xcong.excoin.modules.okxNewPrice.utils.WsMapBuild;
import com.xcong.excoin.modules.okxNewPrice.utils.WsParamBuild;
-import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.java_websocket.client.WebSocketClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import java.math.BigDecimal;
-import java.util.Optional;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @author Administrator
@@ -22,8 +19,9 @@
@Slf4j
public class PositionsWs {
+ public static final Map<String,BigDecimal> POSITIONSWSMAP = new ConcurrentHashMap<>();
+
public static final String POSITIONSWS_CHANNEL = "positions";
- private static final String REDIS_KEY_PREFIX = POSITIONSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode();
public static void subscribePositionChannel(WebSocketClient webSocketClient, String option) {
try {
@@ -31,10 +29,7 @@
JSONObject args = new JSONObject();
args.put("channel", POSITIONSWS_CHANNEL);
args.put("instType", CoinEnums.INSTTYPE_SWAP.getCode());
-// args.put("instId", CoinEnums.HE_YUE.getCode());
- JSONObject updateInterval = new JSONObject();
- updateInterval.put("updateInterval",CoinEnums.UPDATEINTERVAL.getCode());
- args.put("extraParams", updateInterval);
+ args.put("instId", CoinEnums.HE_YUE.getCode());
argsArray.add(args);
String connId = MallUtils.getOrderNum(POSITIONSWS_CHANNEL);
@@ -46,7 +41,7 @@
}
}
- public static void handleEvent(JSONObject response, RedisUtils redisUtils) {
+ public static void handleEvent(JSONObject response) {
log.info("开始执行PositionsWs......");
@@ -55,7 +50,7 @@
if (dataArray == null || dataArray.isEmpty()) {
log.info("账户持仓频道数据为空,已当前价买入，并且初始化网格");
JSONObject posData = new JSONObject();
- processPositionData(posData, redisUtils);
+ processPositionData(posData);
return;
}
@@ -95,7 +90,8 @@
last, idxPx, bePx, realizedPnl, settledPnl,
markPx
);
- processPositionData(posData, redisUtils);
+
+ processPositionData(posData);
}
}
} catch (Exception e) {
@@ -103,101 +99,15 @@
}
}
- private static void processPositionData(JSONObject posData, RedisUtils redisUtils) {
- try {
- String avgPx = safeGetString(posData, "avgPx");
- String pos = safeGetString(posData, "pos");
- String upl = safeGetString(posData, "upl");
- String imr = safeGetString(posData, "imr");
- String mgnRatio = safeGetString(posData, "mgnRatio");
- String markPx = safeGetString(posData, "markPx");
- String bePx = safeGetString(posData, "bePx");
- String realizedPnl = safeGetString(posData, "realizedPnl");
+ private static void processPositionData(JSONObject posData) {
+ WsMapBuild.saveBigDecimalToMap(POSITIONSWSMAP, "avgPx", WsMapBuild.parseBigDecimalSafe(posData.getString("avgPx")));
+ WsMapBuild.saveBigDecimalToMap(POSITIONSWSMAP, "pos", WsMapBuild.parseBigDecimalSafe(posData.getString("pos")));
+ WsMapBuild.saveBigDecimalToMap(POSITIONSWSMAP, "upl", WsMapBuild.parseBigDecimalSafe(posData.getString("upl")));
+ WsMapBuild.saveBigDecimalToMap(POSITIONSWSMAP, "imr", WsMapBuild.parseBigDecimalSafe(posData.getString("imr")));
+ WsMapBuild.saveBigDecimalToMap(POSITIONSWSMAP, "mgnRatio", WsMapBuild.parseBigDecimalSafe(posData.getString("mgnRatio")));
+ WsMapBuild.saveBigDecimalToMap(POSITIONSWSMAP, "markPx", WsMapBuild.parseBigDecimalSafe(posData.getString("markPx")));
+ WsMapBuild.saveBigDecimalToMap(POSITIONSWSMAP, "bePx", WsMapBuild.parseBigDecimalSafe(posData.getString("bePx")));
+ WsMapBuild.saveBigDecimalToMap(POSITIONSWSMAP, "realizedPnl", WsMapBuild.parseBigDecimalSafe(posData.getString("realizedPnl")));
- boolean setResult = saveToRedis(redisUtils, avgPx, pos, upl, imr, mgnRatio, markPx, bePx,realizedPnl);
-
- if (setResult) {
- calculateAndSaveBuyCount(redisUtils);
- } else {
- log.warn("Redis操作失败");
- }
- } catch (Exception e) {
- log.error("Redis操作异常", e);
- }
- }
-
- private static boolean saveToRedis(RedisUtils redisUtils,
- String avgPx, String pos, String upl,
- String imr, String mgnRatio, String markPx, String bePx, String realizedPnl) {
- return redisUtils.set(REDIS_KEY_PREFIX + ":avgPx", avgPx, 0)
- && redisUtils.set(REDIS_KEY_PREFIX + ":pos", pos, 0)
- && redisUtils.set(REDIS_KEY_PREFIX + ":upl", upl, 0)
- && redisUtils.set(REDIS_KEY_PREFIX + ":imr", imr, 0)
- && redisUtils.set(REDIS_KEY_PREFIX + ":mgnRatio", mgnRatio, 0)
- && redisUtils.set(REDIS_KEY_PREFIX + ":markPx", markPx, 0)
- && redisUtils.set(REDIS_KEY_PREFIX + ":bePx", bePx, 0)
- && redisUtils.set(REDIS_KEY_PREFIX + ":realizedPnl", realizedPnl, 0);
- }
-
- private static void calculateAndSaveBuyCount(RedisUtils redisUtils) {
- try {
- String ctValStr = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":ctVal");
- String markPxStr = (String) redisUtils.get(REDIS_KEY_PREFIX + ":markPx");
- String minSzStr = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":minSz");
- String everyTimeUsdt = (String) redisUtils.get(AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":everyTimeUsdt");
-
- BigDecimal margin = parseBigDecimal(everyTimeUsdt, "0");
- BigDecimal leverage = parseBigDecimal(OrderParamEnums.LEVERAGE.getValue(), "1");
- BigDecimal faceValue = parseBigDecimal(ctValStr, "0");
- BigDecimal markPrice = parseBigDecimal(markPxStr, "0"); // 默认值需谨慎对待
- int minLotSz = parseInt(minSzStr, 0);
-
- BigDecimal buyCnt = buyCnt(margin, leverage, faceValue, markPrice, minLotSz);
- redisUtils.set(REDIS_KEY_PREFIX + ":buyCnt", buyCnt.toString(), 0);
- } catch (NumberFormatException | ArithmeticException e) {
- log.error("计算购买数量时发生数字转换错误", e);
- }
- }
-
- private static String safeGetString(JSONObject obj, String key) {
- return Optional.ofNullable(obj.getString(key)).orElse("0");
- }
-
- private static BigDecimal parseBigDecimal(String value, String defaultValue) {
- return new BigDecimal(Optional.ofNullable(value).filter(s -> !s.isEmpty()).orElse(defaultValue));
- }
-
- private static int parseInt(String value, int defaultValue) {
- try {
- return Integer.parseInt(value);
- } catch (NumberFormatException e) {
- return defaultValue;
- }
- }
-
- /**
- * 计算购买合约的数量
- *
- * USDT 币本位合约
- * 公式：张数 = 保证金 / (面值 * 标记价格 / 杠杆倍数)
- *
- * @param margin 用户的保证金金额
- * @param leverage 杠杆倍数
- * @param faceValue 合约面值
- * @param markPrice 标记价格
- * @param minLotSz 最小下单精度
- * @return 返回用户可以购买的合约数量
- */
- public static BigDecimal buyCnt(BigDecimal margin, BigDecimal leverage, BigDecimal faceValue, BigDecimal markPrice, int minLotSz) {
- if (margin.compareTo(BigDecimal.ZERO) <= 0 ||
- leverage.compareTo(BigDecimal.ZERO) <= 0 ||
- faceValue.compareTo(BigDecimal.ZERO) <= 0 ||
- markPrice.compareTo(BigDecimal.ZERO) <= 0) {
- return BigDecimal.ZERO;
- }
-
- BigDecimal divisor = markPrice.divide(leverage, 10, BigDecimal.ROUND_DOWN);
- BigDecimal denominator = faceValue.multiply(divisor);
- return margin.divide(denominator, minLotSz, BigDecimal.ROUND_DOWN);
}
}
--
Gitblit v1.9.1