From 79224bc3495cf80370855e9e2fe9e2acd1f3e63b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 07 Apr 2021 17:16:52 +0800
Subject: [PATCH] modify whole force price

---
 src/main/java/com/xcong/excoin/utils/CalculateUtil.java |    9 ++++++++-
 1 files changed, 8 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 ba61bf6..e350857 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);
@@ -247,7 +254,7 @@
 //            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