From ce4fb58f85eefe9fe6bb6213d8f1576d1925a5ef Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 07 Jul 2020 19:15:35 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin --- src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java index bc6a86c..221d480 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java +++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java @@ -64,12 +64,12 @@ private Integer tradeType; public BigDecimal getOpeningFeeAmount() { - return openingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN); + return openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN); } public BigDecimal getClosingFeeAmount() { - return closingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN); + return closingFeeAmount == null ? closingFeeAmount : closingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN); } } -- Gitblit v1.9.1