From ac41079aedd2949f30308a25cf1814e2cd6b49a6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 06 Jan 2026 17:43:17 +0800
Subject: [PATCH] fix(okxWs): 修复订单信息处理中的参数遗漏问题
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java | 96 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 31 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 14f0079..883a2ca 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 {
@@ -104,34 +106,10 @@
accFillSz, avgPx,state, fillFee,posSide
);
-
- Map<String, String> accountMap = getAccountMap(accountName);
String stateStr = TradeOrderWs.getAccountMap(accountName).get("state");
- boolean longSell = CoinEnums.POSSIDE_LONG.getCode().equals(posSide) && CoinEnums.SIDE_SELL.getCode().equals(side);
- boolean shortBuy = CoinEnums.POSSIDE_SHORT.getCode().equals(posSide) && CoinEnums.SIDE_BUY.getCode().equals(side);
- if (
- CoinEnums.ORDER_FILLED.getCode().equals(state)
- && (longSell || shortBuy)
- ){
- WsMapBuild.saveStringToMap(accountMap, "orderPrice",avgPx);
- }
-
- String clOrdIdStr = TradeOrderWs.getAccountMap(accountName).get("clOrdId");
- if (
- StrUtil.isNotBlank(clOrdIdStr)
- && clOrdId.equals(clOrdIdStr)
- && StrUtil.isNotBlank(stateStr)
- && state.equals(stateStr)
- ){
- //记录成交均价
- if (accountMap.get("orderPrice") == null){
- log.info("成交均价: {}", avgPx);
- WsMapBuild.saveStringToMap(accountMap, "orderPrice",avgPx);
- }
- WsMapBuild.saveStringToMap(TradeOrderWs.getAccountMap(accountName), "state", CoinEnums.ORDER_LIVE.getCode());
-
+ if (StrUtil.isNotBlank(stateStr) && state.equals(stateStr)){
// 使用账号特定的Map
- String positionAccountName = PositionsWs.initAccountName(accountName, side);
+ String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
Map<String, BigDecimal> positionsMap = PositionsWs.getAccountMap(positionAccountName);
WsMapBuild.saveBigDecimalToMap(positionsMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));
@@ -140,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(
@@ -159,9 +138,33 @@
tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
tradeRequestParam.setSide(CoinEnums.POSSIDE_LONG.getCode().equals(posSide) ? CoinEnums.SIDE_SELL.getCode() : CoinEnums.SIDE_BUY.getCode());
- tradeRequestParam.setClOrdId(WsParamBuild.getOrderNum(side));
+ tradeRequestParam.setClOrdId(WsParamBuild.getOrderNum(tradeRequestParam.getSide()));
tradeRequestParam.setSz(accFillSz);
- return tradeRequestParam;
+ tradeRequestParams.add(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;
@@ -171,6 +174,37 @@
}
return null;
}
+
+ public static void main(String[] args) {
+ System.out.println(
+ getZhiYingPx(
+ "eth",
+ CoinEnums.POSSIDE_LONG.getCode(),
+ "0.0001",
+ new BigDecimal("0.1"),
+ new BigDecimal("0.05"),
+ new BigDecimal("1"),
+ new BigDecimal("2950"),
+ new BigDecimal("100"))
+ );
+ }
+ /**
+ * 计算预期收益
+ */
+ 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);
+ }
/**
* 计算预期收益
*/
@@ -179,7 +213,7 @@
BigDecimal contractMultiplier, BigDecimal avgPx, BigDecimal leverage
) {
BigDecimal initMargin = getInitMargin(coinValue, coinNum, contractMultiplier, avgPx, leverage);
- String pingCangImr = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name());
+ 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()).setScale(4, RoundingMode.DOWN);
log.info("{}: 订单详情-预期收益: {}", accountName, expectProfit);
return getMarkPrice(expectProfit,posSide, coinValue, coinNum, contractMultiplier, avgPx, leverage);
@@ -191,7 +225,7 @@
*/
public static BigDecimal getInitMargin(BigDecimal coinValue, BigDecimal coinNum, BigDecimal contractMultiplier, BigDecimal avgPx, BigDecimal leverage) {
BigDecimal initMargin = coinValue.multiply(coinNum).multiply(contractMultiplier).multiply(avgPx).divide(leverage, 4, RoundingMode.DOWN);
- log.info("{}: 订单详情-初始保证金: {}", initMargin);
+ log.info("订单详情-初始保证金: {}", initMargin);
return initMargin;
}
/**
--
Gitblit v1.9.1