From 286c795c60057af1fa7439e49c0135ae0110d251 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 19:13:59 +0800
Subject: [PATCH] modify
---
src/test/java/com/xcong/excoin/WholeTest.java | 4 ++--
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index d4c2dd2..ba1125e 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -175,7 +175,11 @@
BigDecimal totalBondAmount = BigDecimal.ZERO;
BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
- totalBondAmount = totalBondAmount.add(holdOrderEntity.getBondAmount());
+ if (holdOrderEntity.getId().equals(contractHoldOrderEntity.getId())) {
+ totalBondAmount = totalBondAmount.add(holdOrderEntity.getHoldBond());
+ } else {
+ totalBondAmount = totalBondAmount.add(holdOrderEntity.getBondAmount());
+ }
totalProfitOrLoss = totalProfitOrLoss.add(calProfitOrLoss(holdOrderEntity, memberEntity));
}
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index 7ea9e62..83ee582 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -200,8 +200,8 @@
@Test
public void wholeForceNewTest() {
- MemberEntity memberEntity = memberDao.selectById(19L);
- ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(285L);
+ MemberEntity memberEntity = memberDao.selectById(15L);
+ ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(300L);
System.out.println(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrder));
}
--
Gitblit v1.9.1