From bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 15:38:42 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 18d649c..87a2eb8 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);
@@ -526,7 +526,7 @@
String nickname = followTraderInfoEntity.getNickname();
myFollowTraderInfoVo.setNickname(nickname);
BigDecimal totalPrincipal = FollowFollowerProfitEntity.getTotalPrincipal();
- myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
+ myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal.setScale(2, BigDecimal.ROUND_DOWN));
BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();
myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
@@ -1032,7 +1032,11 @@
tradeProfitInfoVo.setTotalFollowerCnt(totalFollowerCnt);
BigDecimal totalOrderCnt = followTraderProfitInfoVo.getTotalOrderCnt();
tradeProfitInfoVo.setTotalOrderCnt(totalOrderCnt);
- }
+ BigDecimal thirtyProfitRatio = followTraderProfitInfoVo.getThirtyProfitRatio();
+ tradeProfitInfoVo.setThirtyProfitRatio(thirtyProfitRatio);
+ BigDecimal thirtyRatio = followTraderProfitInfoVo.getThirtyRatio();
+ tradeProfitInfoVo.setThirtyRatio(thirtyRatio);
+ }
return Result.ok(tradeProfitInfoVo);
}
@@ -1148,6 +1152,7 @@
BigDecimal rewardAmount = orderEntity.getRewardAmount();
allRewardAmount = allRewardAmount.add(rewardAmount);
BigDecimal rewardRatio = orderEntity.getRewardRatio();
+ rewardRatio = rewardRatio == null ? BigDecimal.ZERO : rewardRatio;
allRewardRatio = allRewardRatio.add(rewardRatio);
}
}
@@ -1170,7 +1175,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);
--
Gitblit v1.9.1