From 6b9b8b50fbefd21479197ccfa9abfe039e04f1d6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Sep 2020 16:23:07 +0800
Subject: [PATCH] Merge branch 'master' into whole_new
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 33eda2d..07d1d01 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -136,8 +136,15 @@
}
// log.info("{}, {}, {}, {}, {}, {}", totalBondAmount, symbolBondAmount, symbolFeeAmount, openPrice, profitOrLoss, leverRatio);
- BigDecimal sub = walletContract.getTotalBalance().add(profitOrLoss).subtract(symbolFeeAmount).subtract(totalBondAmount);
+ BigDecimal equity = walletContract.getTotalBalance().add(profitOrLoss);
+ BigDecimal sub = equity.subtract(symbolFeeAmount).subtract(totalBondAmount);
// log.info("sub -- {}", sub);
+ if (sub.compareTo(symbolBondAmount) <= 0) {
+ BigDecimal multi = BigDecimal.valueOf(10);
+ BigDecimal divide = equity.divide(equity.add(multi), 8, BigDecimal.ROUND_DOWN);
+ sub = symbolBondAmount.multiply(divide);
+ }
+
BigDecimal divide = sub.divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN);
// log.info("divide -- {}", divide);
BigDecimal divide2 = openPrice.divide(BigDecimal.valueOf(leverRatio), 8, BigDecimal.ROUND_DOWN);
@@ -149,7 +156,7 @@
} else {
forcePrice = openPrice.subtract(divide.multiply(divide2));
}
-// log.info("forcePrice -- {}", forcePrice);
+// log.info("forcePrice -- {}, {}", forcePrice, symbol);
if (StrUtil.isBlank(currentSymbol)) {
holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
}
--
Gitblit v1.9.1