From f2c1b2853b2f0d0a0efb95a9c8df95ec1da908ad Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 07 Jan 2026 11:13:36 +0800
Subject: [PATCH] fix(trading): 修复交易系统中的计算错误和日志级别问题
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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 a27dad2..afcf78e 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
@@ -3,6 +3,10 @@
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.okxWs.param.TradeRequestParam;
+import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListEnum;
+import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListService;
import com.xcong.excoin.modules.okxNewPrice.okxpi.MallUtils;
import com.xcong.excoin.modules.okxNewPrice.utils.WsMapBuild;
import com.xcong.excoin.modules.okxNewPrice.utils.WsParamBuild;
@@ -10,6 +14,9 @@
import org.java_websocket.client.WebSocketClient;
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;
@@ -58,7 +65,7 @@
initParam(arg, accountName,CoinEnums.POSSIDE_SHORT.getCode());
}
- public static void handleEvent(JSONObject response, String accountName) {
+ public static List<TradeRequestParam> handleEvent(JSONObject response, String accountName) {
log.info("开始执行PositionsWs......");
@@ -66,8 +73,10 @@
JSONArray dataArray = response.getJSONArray("data");
if (dataArray == null || dataArray.isEmpty()) {
log.info("账户持仓频道数据为空,等待更新");
- return;
+ return null;
}
+
+ List<TradeRequestParam> tradeRequestParamList = new ArrayList<>();
for (int i = 0; i < dataArray.size(); i++) {
JSONObject posData = dataArray.getJSONObject(i);
@@ -107,19 +116,50 @@
last, idxPx, bePx, realizedPnl, settledPnl,
markPx,fee,fundingFee
);
- initParam(posData, accountName,posSide);
+ //先更新缓存
+ Map<String, BigDecimal> stringBigDecimalMap = initParam(posData, accountName, posSide);
+ //构建止损参数
+ if (stringBigDecimalMap.get("pos").compareTo(BigDecimal.ZERO) > 0){
+ TradeRequestParam tradeRequestParam = new TradeRequestParam();
+ // 1. 判断当前价格属于哪个网格
+ WangGeListEnum gridByPriceNew = WangGeListEnum.getGridByPrice(new BigDecimal(avgPx));
+ if (gridByPriceNew != null) {
+ String zhiSunDian = gridByPriceNew.getZhi_sun_dian();
+ String fangXiang = gridByPriceNew.getFang_xiang();
+ BigDecimal fangXiangNow = stringBigDecimalMap.get("posSide");
+ if (fangXiangNow.equals(fangXiang)){
+ tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
+ tradeRequestParam.setMarkPx(String.valueOf(zhiSunDian));
+ }else{
+ tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
+ tradeRequestParam.setMarkPx(String.valueOf(markPx));
+ }
+ }else{
+ tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
+ tradeRequestParam.setMarkPx(String.valueOf(markPx));
+ }
- String accountNamePositons = initAccountName(accountName, posSide);
- Map<String, BigDecimal> accountMap = getAccountMap(accountNamePositons);
- WsMapBuild.saveBigDecimalToMap(accountMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()));
+
+ tradeRequestParam.setAccountName(accountName);
+ tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
+ tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
+ tradeRequestParam.setPosSide(posSide);
+ 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(tradeRequestParam.getSide()));
+ tradeRequestParam.setSz(String.valueOf(stringBigDecimalMap.get("pos")));
+ tradeRequestParamList.add(tradeRequestParam);
+ }
}
}
+ return tradeRequestParamList;
} catch (Exception e) {
log.error("处理持仓频道推送数据失败", e);
}
+ return null;
}
- private static void initParam(JSONObject posData, String accountName,String posSide) {
+ private static Map<String, BigDecimal> initParam(JSONObject posData, String accountName,String posSide) {
String accountNamePositons = initAccountName(accountName, posSide);
Map<String, BigDecimal> accountMap = getAccountMap(accountNamePositons);
WsMapBuild.saveBigDecimalToMap(accountMap, "avgPx", WsMapBuild.parseBigDecimalSafe(posData.getString("avgPx")));
@@ -132,5 +172,13 @@
WsMapBuild.saveBigDecimalToMap(accountMap, "realizedPnl", WsMapBuild.parseBigDecimalSafe(posData.getString("realizedPnl")));
WsMapBuild.saveBigDecimalToMap(accountMap, "fee", WsMapBuild.parseBigDecimalSafe(posData.getString("fee")));
WsMapBuild.saveBigDecimalToMap(accountMap, "fundingFee", WsMapBuild.parseBigDecimalSafe(posData.getString("fundingFee")));
+
+ BigDecimal ordFrozImr = PositionsWs.getAccountMap(accountNamePositons).get("imr");
+ BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDT.name()))
+ .divide(new BigDecimal("2"), RoundingMode.DOWN);
+ if (ordFrozImr.compareTo(totalOrderUsdt) <= 0){
+ WsMapBuild.saveBigDecimalToMap(accountMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()));
+ }
+ return accountMap;
}
}
--
Gitblit v1.9.1