From 26c03d3b9efc4dd5e12377dec930678042ca4200 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Mar 2021 17:55:00 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index 56dfeaf..9b80efb 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -405,7 +405,7 @@
 						myFollowOrderVo.setLeverRatio(leverRatio);
 						BigDecimal rewardAmount = contractOrderEntity.getRewardAmount().setScale(2, BigDecimal.ROUND_DOWN);
 						myFollowOrderVo.setRewardAmount(rewardAmount);
-						BigDecimal rewardRatio = contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);
+						BigDecimal rewardRatio = contractOrderEntity.getRewardRatio() == null ? BigDecimal.ZERO : contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);
 						myFollowOrderVo.setRewardRatio(rewardRatio);
 						int symbolCnt = contractOrderEntity.getSymbolCnt();
 						myFollowOrderVo.setSymbolCnt(symbolCnt);
@@ -1148,6 +1148,7 @@
         						BigDecimal rewardAmount = orderEntity.getRewardAmount();
         						allRewardAmount = allRewardAmount.add(rewardAmount);
         						BigDecimal rewardRatio = orderEntity.getRewardRatio();
+								rewardRatio = rewardRatio == null ? BigDecimal.ZERO : rewardRatio;
         						allRewardRatio = allRewardRatio.add(rewardRatio);
         					}
         				}

--
Gitblit v1.9.1