From 1c56b1328ba555b9d96b7988981a3e03bd0bfdeb Mon Sep 17 00:00:00 2001
From: chaosBreaking <x491807573@qq.com>
Date: Sun, 29 Sep 2019 14:43:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B4=AF=E8=AE=A1=E6=8C=96=E7=9F=BF?=
 =?UTF-8?q?=E6=94=B6=E7=9B=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/fund/fund.controller.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/modules/fund/fund.controller.js b/src/modules/fund/fund.controller.js
index 79b334f..1606cdd 100644
--- a/src/modules/fund/fund.controller.js
+++ b/src/modules/fund/fund.controller.js
@@ -233,6 +233,7 @@ module.exports = {
             let revenueLastday = calRevenueLastday(actions);
             // 筛选有效矿晶
             let activeFund = getActiveFund(fund.fundList);    
+            const revenueAll = fund.asset && +fund.asset['vic'] > +fund.asset['usdt'] ? +fund.asset['vic'] - +fund.asset['usdt'] : 0;
             return res.json({
                 code: 0,
                 msg: '刷新成功',
@@ -241,7 +242,7 @@ module.exports = {
                     basic: {
                         activeFund,
                         revenueLastday,
-                        revenueAll: fund.asset && +fund.asset['vic'] - +fund.asset['usdt'] // 总金额 - 社区奖励 = 挖矿奖励
+                        revenueAll
                     }
                 }
             });
@@ -255,6 +256,7 @@ module.exports = {
         // 筛选有效矿晶
         let activeFund = getActiveFund(fund.fundList);
         if (!newFund || !newFund.fundList) newFund = fund;
+        const revenueAll = fund.asset && +fund.asset['vic'] > +fund.asset['usdt'] ? +fund.asset['vic'] - +fund.asset['usdt'] : 0;
         return res.json({
             code: 0,
             msg: '刷新成功',
@@ -263,7 +265,7 @@ module.exports = {
                 basic: {
                     activeFund, //有效矿晶
                     revenueLastday, // 昨日收益
-                    revenueAll: +newFund.asset['vic'] - +newFund.asset['usdt'] // 累计总收益 - 社区奖励 = 挖矿奖励
+                    revenueAll
                 }
             }
         });
@@ -293,12 +295,13 @@ module.exports = {
             let revenueLastday = calRevenueLastday(actions);
             // 筛选有效矿晶      
             let activeFund = getActiveFund(fund.fundList);
+            const revenueAll = fund.asset && +fund.asset['vic'] > +fund.asset['usdt'] ? +fund.asset['vic'] - +fund.asset['usdt'] : 0;
             return res.json({
                 code: 0,
                 data: {
                     activeFund,
                     revenueLastday,
-                    revenueAll: fund.asset && +fund.asset['vic'] - +fund.asset['usdt'] // 总金额 - 社区奖励 = 挖矿奖励
+                    revenueAll // 总金额 - 社区奖励 = 挖矿奖励
                 }
             });
         }).catch(err => {