From 7548c520b30997643577eea74ee71281b605b384 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 08 Apr 2021 18:05:05 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index ba61bf6..76e886a 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -204,6 +204,13 @@
return forcePrice;
}
+ /**
+ * 权益-维持保证金+开仓价*张数*规格-开仓价*费率-(总账户-维持保证金) / 规格*张数
+ *
+ * @param memberEntity
+ * @param contractHoldOrderEntity
+ * @return
+ */
public static BigDecimal calWholePriceTwo(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity) {
ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
@@ -231,23 +238,23 @@
// 成本 数量*面值*开仓价
BigDecimal cost = contractHoldOrderEntity.getSymbolSku().multiply(contractHoldOrderEntity.getOpeningPrice()).multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCntSale()));
// 费率
- BigDecimal ratio = newPrice.multiply(new BigDecimal("0.005"));
+ BigDecimal ratio = contractHoldOrderEntity.getOpeningPrice().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 prefix = cost.subtract(ratio);
BigDecimal divideChild;
if (ContractHoldOrderEntity.OPENING_TYPE_MORE == contractHoldOrderEntity.getOpeningType()) {
- divideChild = prefix.subtract(orderProfitOrLoss);
+ divideChild = prefix.subtract(orderProfitOrLoss).subtract(qy);
} else {
- divideChild = prefix.add(orderProfitOrLoss);
+ divideChild = prefix.add(orderProfitOrLoss).add(qy);
}
// 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();
+ forcePrice = divideChild.divide(divideParent, 8, BigDecimal.ROUND_DOWN);
}
return forcePrice;
}
--
Gitblit v1.9.1