From 39252ec46c56c2f444b18af97180a9c07519bff6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 06 Jan 2026 16:20:15 +0800
Subject: [PATCH] refactor(okxNewPrice): 重构交易订单处理逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
index ec8478f..5e3df73 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
@@ -16,6 +16,8 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -69,7 +71,7 @@
private static final String STATE_KEY = "state";
private static final String FILLFEE_KEY = "fillFee";
private static final String POSSIDE_KEY = "posSide";
- public static TradeRequestParam handleEvent(JSONObject response, RedisUtils redisUtils, String accountName) {
+ public static List<TradeRequestParam> handleEvent(JSONObject response, RedisUtils redisUtils, String accountName) {
log.info("开始执行OrderInfoWs......");
try {
@@ -116,6 +118,7 @@
log.info("{}: 订单详情已完成: {}, 自定义编号: {}", accountName, CoinEnums.HE_YUE.getCode(), clOrdId);
+ ArrayList<TradeRequestParam> tradeRequestParams = new ArrayList<>();
TradeRequestParam tradeRequestParam = new TradeRequestParam();
tradeRequestParam.setAccountName(accountName);
BigDecimal zhiYingPx = getZhiYingPx(
@@ -137,7 +140,30 @@
tradeRequestParam.setSide(CoinEnums.POSSIDE_LONG.getCode().equals(posSide) ? CoinEnums.SIDE_SELL.getCode() : CoinEnums.SIDE_BUY.getCode());
tradeRequestParam.setClOrdId(WsParamBuild.getOrderNum(tradeRequestParam.getSide()));
tradeRequestParam.setSz(accFillSz);
- return tradeRequestParam;
+
+ TradeRequestParam tradeRequestParamZhiSun = new TradeRequestParam();
+ tradeRequestParamZhiSun.setAccountName(accountName);
+ BigDecimal zhiSunPx = getZhiSunPx(
+ accountName,
+ posSide,
+ fillFee,
+ WsMapBuild.parseBigDecimalSafe(InstrumentsWs.getAccountMap(accountName).get(CoinEnums.CTVAL.name())),
+ WsMapBuild.parseBigDecimalSafe(accFillSz),
+ WsMapBuild.parseBigDecimalSafe(InstrumentsWs.getAccountMap(accountName).get(CoinEnums.CONTRACTMULTIPLIER.name())),
+ WsMapBuild.parseBigDecimalSafe(avgPx),
+ WsMapBuild.parseBigDecimalSafe(CoinEnums.LEVERAGE.getCode())
+ );
+ tradeRequestParamZhiSun.setMarkPx(String.valueOf(zhiSunPx));
+ tradeRequestParamZhiSun.setInstId(CoinEnums.HE_YUE.getCode());
+ tradeRequestParamZhiSun.setTdMode(CoinEnums.CROSS.getCode());
+ tradeRequestParamZhiSun.setPosSide(posSide);
+ tradeRequestParamZhiSun.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
+ tradeRequestParamZhiSun.setTradeType(OrderParamEnums.TRADE_YES.getValue());
+ tradeRequestParamZhiSun.setSide(CoinEnums.POSSIDE_LONG.getCode().equals(posSide) ? CoinEnums.SIDE_SELL.getCode() : CoinEnums.SIDE_BUY.getCode());
+ tradeRequestParamZhiSun.setClOrdId(WsParamBuild.getOrderNum(tradeRequestParamZhiSun.getSide()));
+ tradeRequestParamZhiSun.setSz(accFillSz);
+ tradeRequestParams.add(tradeRequestParamZhiSun);
+ return tradeRequestParams;
}
return null;
@@ -164,6 +190,23 @@
/**
* 计算预期收益
*/
+ public static BigDecimal getZhiSunPx(
+ String accountName, String posSide, String fillFee, BigDecimal coinValue, BigDecimal coinNum,
+ BigDecimal contractMultiplier, BigDecimal avgPx, BigDecimal leverage
+ ) {
+ BigDecimal initMargin = getInitMargin(coinValue, coinNum, contractMultiplier, avgPx, leverage);
+ String pingCangImr = StrUtil.isEmpty(InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name())) ? "0.2" : InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name());
+ BigDecimal expectProfit = (initMargin)
+ .multiply(new BigDecimal(pingCangImr))
+ .add(new BigDecimal(fillFee).abs())
+ .multiply(new BigDecimal("-1"))
+ .setScale(4, RoundingMode.DOWN);
+ log.info("{}: 订单详情-预期收益: {}", accountName, expectProfit);
+ return getMarkPrice(expectProfit,posSide, coinValue, coinNum, contractMultiplier, avgPx, leverage);
+ }
+ /**
+ * 计算预期收益
+ */
public static BigDecimal getZhiYingPx(
String accountName, String posSide, String fillFee, BigDecimal coinValue, BigDecimal coinNum,
BigDecimal contractMultiplier, BigDecimal avgPx, BigDecimal leverage
--
Gitblit v1.9.1