From ff3f4cf0373b4429de977c3eb866fd90e3734212 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Feb 2021 17:51:47 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 6fd61f5..935f1f3 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -97,8 +97,6 @@
for (String symbol : symbols) {
// 其他币种成本
BigDecimal totalBondAmount = BigDecimal.ZERO;
- // 当前币种手续费
- BigDecimal symbolFeeAmount = BigDecimal.ZERO;
// 当前币种保证金
BigDecimal symbolBondAmount = BigDecimal.ZERO;
@@ -116,8 +114,7 @@
if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
isAloneLess = false;
}
- symbolFeeAmount = symbolFeeAmount.add(holdOrderEntity.getOpeningFeeAmount());
- symbolBondAmount = symbolBondAmount.add(bondAmount);
+ symbolBondAmount = symbolBondAmount.add(bondAmount.subtract(holdOrderEntity.getOpeningFeeAmount()));
if (openPrice.compareTo(BigDecimal.ZERO) == 0) {
openPrice = holdOrderEntity.getOpeningPrice();
@@ -132,8 +129,8 @@
}
// log.info("{}, {}, {}, {}, {}, {}", totalBondAmount, symbolBondAmount, symbolFeeAmount, openPrice, profitOrLoss, leverRatio);
- BigDecimal equity = walletContract.getTotalBalance().add(profitOrLoss);
- BigDecimal sub = equity.subtract(symbolFeeAmount).subtract(totalBondAmount);
+ BigDecimal equity = walletContract.getTotalBalance().add(profitOrLoss).subtract(walletContract.getFrozenBalance());
+ BigDecimal sub = equity.subtract(totalBondAmount);
// log.info("sub -- {}", sub);
if (sub.compareTo(symbolBondAmount) <= 0) {
BigDecimal multi = BigDecimal.valueOf(10);
--
Gitblit v1.9.1