From 2296bf6f7d4364dd09dfc6c1ad46a561cfa1803c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 31 Mar 2021 12:33:14 +0800
Subject: [PATCH] 20210331 返利记录的修改
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 13 ++++++++++++-
1 files changed, 12 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 d4c2dd2..bf072e2 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -163,6 +163,13 @@
return result;
}
+ /**
+ * 开仓价 +/- (权益 - 其他币种成本 - 当前币种维持保证金)/(规格*张数)
+ *
+ * @param memberEntity
+ * @param contractHoldOrderEntity
+ * @return
+ */
public static BigDecimal calForcePriceForWhole(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity) {
ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
@@ -175,7 +182,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));
}
--
Gitblit v1.9.1