vic/vic-server-mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 累计挖矿收益

Browse Source
This commit is contained in:
chaosBreaking
2019-09-29 14:43:20 +08:00
parent a0d14afcc0
commit 1c56b1328b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/fund/fund.controller.js
View File

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