From 91f65085e1aa5670caed727e736d053a14a9cf23 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Sep 2020 18:39:19 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 13 +++++++++++--
1 files changed, 11 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 1361e4f..2a1c7b3 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -112,10 +112,14 @@
BigDecimal profitOrLoss = BigDecimal.ZERO;
// 杠杆
int leverRatio = 0;
+ boolean isAloneLess = true;
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
BigDecimal bondAmount = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount());
if (symbol.equalsIgnoreCase(holdOrderEntity.getSymbol())) {
+ if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
+ isAloneLess = false;
+ }
symbolFeeAmount = symbolFeeAmount.add(holdOrderEntity.getOpeningFeeAmount());
symbolBondAmount = symbolBondAmount.add(bondAmount);
@@ -134,12 +138,17 @@
// log.info("{}, {}, {}, {}, {}, {}", totalBondAmount, symbolBondAmount, symbolFeeAmount, openPrice, profitOrLoss, leverRatio);
BigDecimal sub = walletContract.getTotalBalance().add(profitOrLoss).subtract(symbolFeeAmount).subtract(totalBondAmount);
// log.info("sub -- {}", sub);
- BigDecimal divide = sub.divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN);
+ BigDecimal divide = sub.abs().divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN);
// log.info("divide -- {}", divide);
BigDecimal divide2 = openPrice.divide(BigDecimal.valueOf(leverRatio), 8, BigDecimal.ROUND_DOWN);
// log.info("divide2 -- {}", divide2);
- BigDecimal forcePrice = openPrice.subtract(divide.multiply(divide2));
+ BigDecimal forcePrice = BigDecimal.ZERO;
+ if (isAloneLess) {
+ forcePrice = openPrice.add(divide.multiply(divide2));
+ } else {
+ forcePrice = openPrice.subtract(divide.multiply(divide2));
+ }
// log.info("forcePrice -- {}", forcePrice);
if (StrUtil.isBlank(currentSymbol)) {
holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
--
Gitblit v1.9.1