From f5e6133809c553cfd9fb28ee61019927c547c374 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 08 Dec 2021 15:58:33 +0800
Subject: [PATCH] 20211208 fish
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
index e33dce0..2939331 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
@@ -82,30 +82,38 @@
private int leverRatio;
public String getClosingPrice() {
- return closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return closingPrice == null ? "" : closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getClosingFeeAmount() {
- return closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return closingFeeAmount == null ? "" : closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getRewardAmount() {
- return rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return rewardAmount == null ? "" : rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningPrice() {
- return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingPrice == null ? "" : openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningFeeAmount() {
- return openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getBondAmount() {
- return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getHoldAmount() {
- return holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return holdAmount == null ? "" : holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ public void setClosingFeeAmount(BigDecimal closingFeeAmount, BigDecimal feeSpread) {
+ this.closingFeeAmount = closingFeeAmount == null ? closingFeeAmount : closingFeeAmount.multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN);
+ }
+
+ public void setOpeningFeeAmount(BigDecimal openingFeeAmount, BigDecimal feeSpread) {
+ this.openingFeeAmount = openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN);
}
}
--
Gitblit v1.9.1