From 36ebe651620a89fd158038defc344a01fa3a3e70 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Mar 2021 16:47:02 +0800
Subject: [PATCH] 20210325 跟随者的历史订单显示爆仓，爆仓算入跟随者收益
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index 9c93699..6635c84 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -499,7 +499,7 @@
}
// 回报率
- BigDecimal returnRate = rewardRatio.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getPrePaymentAmount()), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = rewardRatio.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
// 成本价格
BigDecimal costPrice = holdOrderEntity.getOpeningPrice()
@@ -512,7 +512,7 @@
// if (canAddMaxBond.compareTo(BigDecimal.ZERO) < 0) {
// canAddMaxBond = BigDecimal.ZERO;
// }
- BigDecimal canReduceMaxBond = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount());
+ BigDecimal canReduceMaxBond = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getPrePaymentAmount());
if (rewardRatio.compareTo(BigDecimal.ZERO) < 0) {
canReduceMaxBond = canReduceMaxBond.add(rewardRatio);
@@ -549,7 +549,7 @@
}
result.put("hold", resultList);
- result.put("totalProfitOrLoss", totalProfitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString());
+ result.put("totalProfitOrLoss", totalProfitOrLoss.setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
return Result.ok(result);
}
return Result.ok("success");
--
Gitblit v1.9.1