From 5702319ec386fa3921a36bc82189ea023dd8f237 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 07 Apr 2021 17:02:43 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 8ec19a9..ba61bf6 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -226,9 +226,25 @@
totalProfitOrLoss = totalProfitOrLoss.add(calProfitOrLoss(holdOrderEntity, memberEntity));
}
+ // 维持保证金
BigDecimal holdBond = contractHoldOrderEntity.getHoldBond();
+ // 成本 数量*面值*开仓价
BigDecimal cost = contractHoldOrderEntity.getSymbolSku().multiply(contractHoldOrderEntity.getOpeningPrice()).multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCntSale()));
- BigDecimal divideChild = walletContract.getTotalBalance().subtract(holdBond).subtract(cost).add(newPrice.multiply(new BigDecimal("0.005")));
+ // 费率
+ BigDecimal ratio = newPrice.multiply(new BigDecimal("0.005"));
+ // 总账户 - 维持保证金
+ BigDecimal orderProfitOrLoss = walletContract.getTotalBalance().subtract(holdBond);
+ // 权益
+ BigDecimal qy = walletContract.getTotalBalance().add(totalProfitOrLoss);
+
+ BigDecimal prefix = qy.add(cost).subtract(ratio);
+ BigDecimal divideChild;
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == contractHoldOrderEntity.getOpeningType()) {
+ divideChild = prefix.subtract(orderProfitOrLoss);
+ } else {
+ divideChild = prefix.add(orderProfitOrLoss);
+ }
+// BigDecimal divideChild = walletContract.getTotalBalance().add(totalProfitOrLoss).subtract(holdBond).subtract(cost).add(newPrice.multiply(new BigDecimal("0.005")));
BigDecimal divideParent = contractHoldOrderEntity.getSymbolSku().multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCntSale()));
forcePrice = divideChild.divide(divideParent, 8, BigDecimal.ROUND_DOWN).negate();
--
Gitblit v1.9.1