From 742e80a99ae9e5116c1b1e106bdffd6fde2c22a5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 08 Apr 2021 18:15:57 +0800
Subject: [PATCH] modify force price
---
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 c7369a3..baf5769 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -211,7 +211,7 @@
* @param contractHoldOrderEntity
* @return
*/
- public static BigDecimal calWholePriceTwo(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity) {
+ public static BigDecimal calWholePriceTwo(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity, int type) {
ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
@@ -238,7 +238,7 @@
// 成本 数量*面值*开仓价
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);
// 权益
@@ -255,6 +255,15 @@
BigDecimal divideParent = contractHoldOrderEntity.getSymbolSku().multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCntSale()));
forcePrice = divideChild.divide(divideParent, 8, BigDecimal.ROUND_DOWN);
+ if (type == 2) {
+ log.info("=======全仓爆仓=======");
+ log.info("holdBond : {}", holdBond);
+ log.info("cost : {}", cost);
+ log.info("ratio : {}", ratio);
+ log.info("orderProfitOrLoss : {}", orderProfitOrLoss);
+ log.info("total : {}", walletContract.getTotalBalance());
+ log.info("qy : {}", qy);
+ }
}
return forcePrice;
}
--
Gitblit v1.9.1