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-30 11:20:42 +08:00
parent 0638a4cc5b
commit 3fd1776581
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,12 +295,14 @@ module.exports = {
return Fund.findOne({userId}).then(async fund => { return Fund.findOne({userId}).then(async fund => {
const [ start, end ] = getDate(1); const [ start, end ] = getDate(1);
let now = new Date(); let now = new Date();
// 筛选有效矿晶
let activeFund = getActiveFund(fund.fundList);
const actions = await Action.find({ userId, type: 1, createdAt: { $gt: start, $lt: now } }).exec(); const actions = await Action.find({ userId, type: 1, createdAt: { $gt: start, $lt: now } }).exec();
const allAction = await Action.find({ userId, type: 1 }).exec();
// 计算昨日收益 // 计算昨日收益
let revenueLastday = calRevenueLastday(actions); let revenueLastday = calRevenueLastday(actions);
// 筛选有效矿晶 const revenueAll = Array.isArray(allAction) && allAction.reduce((pre, cur) => (pre.amount && +pre.amount || 0) + (pre.amount && +cur.amount || 0)) || 0;
let activeFund = getActiveFund(fund.fundList); // const revenueAll = fund.asset && +fund.asset['vic'] || 0;
const revenueAll = fund.asset && +fund.asset['vic'] || 0;
return res.json({ return res.json({
code: 0, code: 0,
data: { data: {