From b22f1797312ac54028f24c50ef9277f75c8ef9fc Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 29 Dec 2025 12:43:33 +0800
Subject: [PATCH] refactor(indicator): 重构MACD_MA策略的持仓状态和交易逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java | 127 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 111 insertions(+), 16 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 42ccb40..6edf8d1 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
@@ -5,17 +5,33 @@
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.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 java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @author Administrator
*/
@Slf4j
public class OrderInfoWs {
+
+ // 使用双层Map，第一层key为账号名称，第二层key为数据key
+ public static final Map<String, Map<String, String>> ORDERINFOWSMAP = new ConcurrentHashMap<>();
+
+ // 获取指定账号的Map，如果不存在则创建
+ public static Map<String, String> getAccountMap(String accountName) {
+ return ORDERINFOWSMAP.computeIfAbsent(accountName, k -> new ConcurrentHashMap<>());
+ }
public static final String ORDERINFOWS_CHANNEL = "orders";
@@ -31,10 +47,14 @@
String connId = MallUtils.getOrderNum(ORDERINFOWS_CHANNEL);
JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, option, argsArray);
webSocketClient.send(jsonObject.toJSONString());
- log.info("发送订单频道频道:{}", option);
+// log.info("发送订单频道频道:{}", option);
} catch (Exception e) {
log.error("订阅订单频道构建失败", e);
}
+ }
+
+ public static void initEvent(JSONObject response, String accountName) {
+// log.info("订阅成功: {}", response.getJSONObject("arg"));
}
@@ -47,18 +67,26 @@
private static final String ACCFILLSZ_KEY = "accFillSz";
private static final String AVGPX_KEY = "avgPx";
private static final String STATE_KEY = "state";
- public static void handleEvent(JSONObject response, RedisUtils redisUtils) {
+ private static final String FILLFEE_KEY = "fillFee";
+ private static final String POSSIDE_KEY = "posSide";
+ public static TradeRequestParam handleEvent(JSONObject response, RedisUtils redisUtils, String accountName) {
+
+ log.info("开始执行OrderInfoWs......");
try {
JSONArray dataArray = response.getJSONArray(DATA_KEY);
if (dataArray == null || dataArray.isEmpty()) {
log.warn("订单频道数据为空");
- return;
+ return null;
}
for (int i = 0; i < dataArray.size(); i++) {
JSONObject detail = dataArray.getJSONObject(i);
String instId = detail.getString(INSTID_KEY);
+ if (!CoinEnums.HE_YUE.getCode().equals(instId)){
+ log.info( "订单详情-币种: {} 没有成交订单", CoinEnums.HE_YUE.getCode() );
+ continue;
+ }
String ordId = detail.getString(ORDID_KEY);
String clOrdId = detail.getString(CLORDID_KEY);
String side = detail.getString(SIDE_KEY);
@@ -66,28 +94,95 @@
String accFillSz = detail.getString(ACCFILLSZ_KEY);
String avgPx = detail.getString(AVGPX_KEY);
String state = detail.getString(STATE_KEY);
+ String fillFee = detail.getString(FILLFEE_KEY);
+ String posSide = detail.getString(POSSIDE_KEY);
log.info(
- "订单详情-币种: {}, 系统编号: {}, 自定义编号: {}, 订单方向: {}, 交易模式: {}," +
- " 累计成交数量: {}, 成交均价: {}, 订单状态: {}",
- instId, ordId, clOrdId, side, tdMode,
- accFillSz, avgPx,state
+ "{}: 订单详情-币种: {}, 系统编号: {}, 自定义编号: {}, 订单方向: {}, 交易模式: {}," +
+ " 累计成交数量: {}, 成交均价: {}, 订单状态: {}, 手续费: {}, 持仓方向: {}",
+ accountName, instId, ordId, clOrdId, side, tdMode,
+ accFillSz, avgPx,state, fillFee,posSide
);
- String clOrdIdStr = (String) redisUtils.get(TradeOrderWs.ORDERWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":clOrdId");
- String stateStr = (String) redisUtils.get(TradeOrderWs.ORDERWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
- if (
- clOrdIdStr != null
- && clOrdId.equals(clOrdIdStr)
- && stateStr != null
- && state.equals(stateStr)
- ){
- redisUtils.set(TradeOrderWs.ORDERWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state", OrderParamEnums.STATE_1.getValue(), 0);
+ String stateStr = TradeOrderWs.getAccountMap(accountName).get("state");
+ if (StrUtil.isNotBlank(stateStr) && state.equals(stateStr)){
+ // 使用账号特定的Map
+ String positionAccountName = PositionsWs.initAccountName(accountName, side);
+ Map<String, BigDecimal> positionsMap = PositionsWs.getAccountMap(positionAccountName);
+ WsMapBuild.saveBigDecimalToMap(positionsMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));
+
+ Map<String, String> accountWsMap = AccountWs.getAccountMap(accountName);
+ WsMapBuild.saveStringToMap(accountWsMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());
+
+ log.info("{}: 订单详情已完成: {}, 自定义编号: {}", accountName, CoinEnums.HE_YUE.getCode(), clOrdId);
+ return null;
+
}
+ return null;
}
} catch (Exception e) {
log.error("处理订单频道推送数据失败", e);
}
+ 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 getZhiYingPx(
+ 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()).setScale(4, RoundingMode.DOWN);
+ log.info("{}: 订单详情-预期收益: {}", accountName, expectProfit);
+ return getMarkPrice(expectProfit,posSide, coinValue, coinNum, contractMultiplier, avgPx, leverage);
+ }
+
+ /**
+ * 计算初始保证金
+ * 面值 * 张数 * 合约乘数 * 标记价格 / 杠杆倍数
+ */
+ 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);
+ return initMargin;
+ }
+ /**
+ * USDT保证金合约
+ * 多仓收益 = 面值 * |张数| * 合约乘数 *（标记价格 - 开仓均价）
+ * （标记价格 - 开仓均价） = 多仓收益 /(面值 * |张数| * 合约乘数)
+ * 标记价格 = 多仓收益 /(面值 * |张数| * 合约乘数) + 开仓均价
+ * 空仓收益 = 面值 * |张数| * 合约乘数 *（开仓均价 - 标记价格）
+ * （开仓均价 - 标记价格） = 空仓收益 /(面值 * |张数| * 合约乘数)
+ * 标记价格 = 开仓均价 - 空仓收益 /(面值 * |张数| * 合约乘数)
+ */
+ public static BigDecimal getMarkPrice(BigDecimal expectProfit,String posSide,BigDecimal coinValue, BigDecimal sz, BigDecimal contractMultiplier, BigDecimal openPrice, BigDecimal leverage) {
+ BigDecimal markPrice = BigDecimal.ZERO;
+ BigDecimal multiply = coinValue.multiply(sz.abs()).multiply(contractMultiplier);
+ BigDecimal bigDecimal = expectProfit.divide(multiply, 2, RoundingMode.DOWN);
+ if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide)){
+ markPrice = openPrice.add(bigDecimal).setScale(2, RoundingMode.DOWN);
+ }
+ if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide)){
+ markPrice = openPrice.subtract(bigDecimal).setScale(2, RoundingMode.DOWN);
+ }
+ log.info("订单详情-止盈标记价格: {}", markPrice);
+ return markPrice;
}
}
--
Gitblit v1.9.1