From 6a901e8b1b840f23a80604fe7851e2edf098c015 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 08 Apr 2021 10:01:30 +0800
Subject: [PATCH] modify
---
src/test/java/com/xcong/excoin/WholeTest.java | 30 ++++++++++++++++++++++++++++++
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 2 +-
2 files changed, 31 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 c7369a3..76e886a 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -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);
// 权益
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index f993ff9..bf5a1d5 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -206,4 +206,34 @@
System.out.println(CalculateUtil.calWholePriceTwo(memberEntity, holdOrder));
}
+ @Test
+ public void wholeForceNewTest2() {
+ BigDecimal holdBond = new BigDecimal("1161.8951");
+
+ BigDecimal sku = new BigDecimal("0.1");
+ BigDecimal openPrice = new BigDecimal("58094.75");
+ int cnt = 50;
+ BigDecimal total = new BigDecimal("9866.3820");
+ // 成本 数量*面值*开仓价
+ BigDecimal cost = sku.multiply(openPrice).multiply(new BigDecimal(cnt));
+ // 费率
+ BigDecimal ratio = openPrice.multiply(new BigDecimal("0.005"));
+ // 总账户 - 维持保证金
+ BigDecimal orderProfitOrLoss = total.subtract(holdBond);
+ // 权益
+ BigDecimal qy = BigDecimal.ZERO;
+
+ BigDecimal prefix = cost.subtract(ratio);
+ BigDecimal divideChild;
+// if (ContractHoldOrderEntity.OPENING_TYPE_MORE == contractHoldOrderEntity.getOpeningType()) {
+ divideChild = prefix.subtract(orderProfitOrLoss).subtract(qy);
+// } else {
+// 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 = sku.multiply(new BigDecimal(cnt));
+
+ System.out.println(divideChild.divide(divideParent, 8, BigDecimal.ROUND_DOWN));
+ }
+
}
--
Gitblit v1.9.1