From ce3659e0efa0e3e86b09ab101f7a615ce8ac1414 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 15:56:23 +0800
Subject: [PATCH] modify
---
src/test/java/com/xcong/excoin/WholeTest.java | 12 +++++++++---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 3 +++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index fcd2cd8..00e5277 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -250,6 +250,9 @@
if (i > 0) {
memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
+ // 全仓爆仓
+ ThreadPoolUtils.sendWholePrice(memberEntity.getId());
+
// 发送预估强平价
ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
// 计算佣金
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index 8e7dbf8..2c7a5bb 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -177,10 +177,16 @@
@Test
public void wholeForceTest() {
- // 3153.33181635
-// System.out.println(new BigDecimal("9921.69458495").subtract(new BigDecimal("6768.36276860")));
+ // 8301.38608660
+// System.out.println(new BigDecimal("9925.29996175").subtract(new BigDecimal("1623.91387515")));
- // 33684.14725218
+ BigDecimal aa = new BigDecimal("1623.91387515").subtract(new BigDecimal("0.1").multiply(new BigDecimal(50)).multiply(new BigDecimal("32478.27750300")));
+ BigDecimal bb = new BigDecimal(50).multiply(new BigDecimal("0.1"));
+ BigDecimal divide = aa.divide(bb, 8, BigDecimal.ROUND_DOWN);
+ System.out.println(divide);
+ // -(账户权益-委托保证金-全仓维持保证金-全仓未实现盈利-数量*面值*开仓价格)/(数量*面值)
+ // 30818.00028568
+ // -32153.49472797
}
}
--
Gitblit v1.9.1