From 84c5177578fab8aedcd5a1a6f2e5f6d3e43b091a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 18 May 2026 17:25:26 +0800
Subject: [PATCH] 第二个版本
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 10 +++++-----
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java | 1 +
src/main/java/com/xcong/excoin/modules/gateApi/GateConfig.java | 14 +++++++++-----
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateConfig.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateConfig.java
index a7ccf86..3d6edfe 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateConfig.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateConfig.java
@@ -90,8 +90,8 @@
private final BigDecimal marginRatioLimit;
/** 合约乘数（单张合约代表的基础资产数量，如 BTC_USDT=0.001, ETH_USDT=0.01） */
private final BigDecimal contractMultiplier;
- /** 价格精度（根据合约乘数自动计算的小数位数，如 0.001 → 3，0.01 → 2） */
- private final int pricePrecision;
+ /** 价格精度（交易所价格的最小小数位数，如 XAU_USDT=1 表示 0.1 精度，ETH_USDT=2 表示 0.01 精度） */
+ private final int priceScale;
/** 未实现盈亏计价模式：最新价 / 标记价格 */
private final PnLPriceMode unrealizedPnlPriceMode;
/** 网格绝对步长（shortBaseEntryPrice × gridRate），运行时由队列生成逻辑设置 */
@@ -119,7 +119,7 @@
this.gridQueueSize = builder.gridQueueSize;
this.marginRatioLimit = builder.marginRatioLimit;
this.contractMultiplier = builder.contractMultiplier;
- this.pricePrecision = builder.contractMultiplier.stripTrailingZeros().scale();
+ this.priceScale = builder.priceScale;
this.unrealizedPnlPriceMode = builder.unrealizedPnlPriceMode;
}
@@ -196,8 +196,8 @@
/** @return 合约乘数（单张合约代表的基础资产数量，如 ETH_USDT=0.01） */
public BigDecimal getContractMultiplier() { return contractMultiplier; }
- /** @return 价格精度（根据合约乘数自动计算的小数位数，如 0.001→3，0.01→2），用于价格四舍五入 */
- public int getPricePrecision() { return pricePrecision; }
+ /** @return 价格精度（交易所价格的小数位数，如 1=0.1精度，2=0.01精度），用于价格四舍五入 */
+ public int getPriceScale() { return priceScale; }
/** @return 未实现盈亏计价模式：LAST_PRICE（最新成交价）/ MARK_PRICE（标记价格） */
public PnLPriceMode getUnrealizedPnlPriceMode() { return unrealizedPnlPriceMode; }
@@ -280,6 +280,8 @@
private BigDecimal marginRatioLimit = new BigDecimal("0.2");
/** 合约乘数，默认 0.001 */
private BigDecimal contractMultiplier = new BigDecimal("0.001");
+ /** 价格精度（交易所价格的小数位数），默认 1（0.1 精度） */
+ private int priceScale = 1;
/** 未实现盈亏计价模式，默认 LAST_PRICE（最新成交价） */
private PnLPriceMode unrealizedPnlPriceMode = PnLPriceMode.LAST_PRICE;
@@ -309,6 +311,8 @@
public Builder reopenMaxRetries(int reopenMaxRetries) { this.reopenMaxRetries = reopenMaxRetries; return this; }
/** 设置合约乘数（单张合约代表的基础资产数量） */
public Builder contractMultiplier(BigDecimal contractMultiplier) { this.contractMultiplier = contractMultiplier; return this; }
+ /** 设置价格精度（交易所价格的小数位数，如 1=0.1精度，2=0.01精度） */
+ public Builder priceScale(int priceScale) { this.priceScale = priceScale; return this; }
/** 设置未实现盈亏计价模式 */
public Builder unrealizedPnlPriceMode(PnLPriceMode mode) { this.unrealizedPnlPriceMode = mode; return this; }
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
index f85a5f6..825979d 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -740,7 +740,7 @@
*/
private void generateShortQueue() {
shortPriceQueue.clear();
- int prec = config.getPricePrecision();
+ int prec = config.getPriceScale();
BigDecimal step = shortBaseEntryPrice.multiply(config.getGridRate()).setScale(prec, RoundingMode.HALF_UP);
config.setStep(step);
BigDecimal elem = shortBaseEntryPrice.subtract(step).setScale(prec, RoundingMode.HALF_UP);
@@ -762,7 +762,7 @@
*/
private void generateLongQueue() {
longPriceQueue.clear();
- int prec = config.getPricePrecision();
+ int prec = config.getPriceScale();
BigDecimal step = config.getStep();
BigDecimal elem = shortBaseEntryPrice.add(step).setScale(prec, RoundingMode.HALF_UP);
for (int i = 0; i < config.getGridQueueSize(); i++) {
@@ -793,7 +793,7 @@
int longSize = longPriceQueue.size();
BigDecimal step = config.getStep().subtract(config.getContractMultiplier());
String qty = config.getQuantity();
- int prec = config.getPricePrecision();
+ int prec = config.getPriceScale();
// 空仓队列：id 从 -1 自减, shortPriceQueue[i] → id=-(i+1)
for (int i = 0; i < shortSize; i++) {
@@ -905,7 +905,7 @@
* @param currentPrice 当前 K 线收盘价（最新成交价）
*/
private void processShortGrid(BigDecimal currentPrice) {
- int prec = config.getPricePrecision();
+ int prec = config.getPriceScale();
List<BigDecimal> matched = new ArrayList<>();
synchronized (shortPriceQueue) {
for (BigDecimal p : shortPriceQueue) {
@@ -1062,7 +1062,7 @@
* @param currentPrice 当前 K 线收盘价（最新成交价）
*/
private void processLongGrid(BigDecimal currentPrice) {
- int prec = config.getPricePrecision();
+ int prec = config.getPriceScale();
List<BigDecimal> matched = new ArrayList<>();
synchronized (longPriceQueue) {
for (BigDecimal p : longPriceQueue) {
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
index 484d8ac..8292a6a 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -61,6 +61,7 @@
.overallTp(new BigDecimal("5"))
.maxLoss(new BigDecimal("15"))
.quantity("1")
+ .priceScale(1)
.contractMultiplier(new BigDecimal("0.01"))
.unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
.isProduction(false)
--
Gitblit v1.9.1