From eed344dc081e4d6793da9dca7d7b46247016382c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Sep 2020 11:31:15 +0800
Subject: [PATCH] modify
---
src/test/java/com/xcong/excoin/WholeTest.java | 6 ++++++
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 15 +++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 2a1c7b3..46ecab0 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -136,9 +136,16 @@
}
// 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);
- BigDecimal divide = sub.abs().divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN);
+ 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);
// log.info("divide2 -- {}", divide2);
@@ -149,9 +156,9 @@
} 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);
+// holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
}
if (symbol.equalsIgnoreCase(currentSymbol)) {
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index 8245296..8c4b73a 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -150,4 +150,10 @@
websocketPriceService.wholeBomb("BTC/USDT", "9000");
}
+ @Test
+ public void forceTest() {
+ MemberEntity memberEntity = memberDao.selectById(5L);
+ CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
+ }
+
}
--
Gitblit v1.9.1