From 8c199e4521b59034a3347aa20fa6404cdffc46fe Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Dec 2025 14:29:10 +0800
Subject: [PATCH] fix(okxNewPrice): 调整手续费计算逻辑并优化订单成交均价记录
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
index eb31231..fb46a4d 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -60,8 +60,6 @@
return null;
}
log.info("当前网格: {}", gridByPrice.name());
- Map<String, String> accountMap = InstrumentsWs.getAccountMap(accountName);
- String wanggeName = accountMap.get(CoinEnums.WANG_GE_OLD.name());
PriorityBlockingQueue<AscBigDecimal> ascBigDecimals = wangGeListService.initWangGe(markPx);
if (ascBigDecimals == null){
@@ -71,6 +69,8 @@
/**
* 如果下单的网格不属于同一个网格，则先止损掉老的网格的仓位
*/
+ Map<String, String> accountMap = InstrumentsWs.getAccountMap(accountName);
+ String wanggeName = accountMap.get(CoinEnums.WANG_GE_OLD.name());
if (StrUtil.isNotEmpty(wanggeName) && !wanggeName.equals(gridByPrice.name())){
log.error("正在止损老的网格仓位......");
WangGeListEnum oldWangge = WangGeListEnum.getByName(wanggeName);
@@ -218,7 +218,7 @@
if (pingCang != null && avgPx.compareTo(pingCang.getValue()) < 0) {
log.info("开始减仓...上限队列价格大于开仓价格{}>{}", pingCang.getValue(), avgPx);
// 手续费
- BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee").multiply(new BigDecimal("2"));
+ BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee");
//未实现收益
BigDecimal uplValue = PositionsWs.getAccountMap(positionAccountName).get("upl");
//已实现收益
@@ -299,7 +299,7 @@
log.info("开始减仓...下限队列价格小于开仓价格{}<{}", kaiCang.getValue(), avgPx);
// 手续费
- BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee").multiply(new BigDecimal("2"));
+ BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee");
//未实现收益
BigDecimal uplValue = PositionsWs.getAccountMap(positionAccountName).get("upl");
//已实现收益
--
Gitblit v1.9.1