From 540deec18d12f262f3c19143c8165d207d9e9c67 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 06 Apr 2021 15:39:20 +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 |    6 +++++-
 1 files changed, 5 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 6baf44e..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
@@ -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);
 	}
 

--
Gitblit v1.9.1