From 90a03cde72c7277e82bdb50f0ce7d1119038e254 Mon Sep 17 00:00:00 2001 From: chaosBreaking Date: Mon, 9 Sep 2019 00:18:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/fund/fund.controller.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/fund/fund.controller.js b/src/modules/fund/fund.controller.js index bc39236..4f196ba 100644 --- a/src/modules/fund/fund.controller.js +++ b/src/modules/fund/fund.controller.js @@ -6,13 +6,14 @@ const Fund = require('./fund.model'); const { createAction } = require('../action/action.handler'); const { createTicket } = require('../ticket/ticket.handler'); const { deriveNewAccount } = require('../../utils/account'); -const actionFilter = 'id type amount detail op createdAt'; const { inject } = require('../../common/Provider'); const ETH = require('../../utils/erc20').ERC20; const { USDTAddr } = require('../../common/constant'); const { calRevenueLastday, getActiveFund } = require('./fund.handler'); const { getDate } = require('../../utils/date'); +const actionFilter = 'id type amount detail op createdAt tokenType'; + const depositCoinsList = [{ id: 'usdtETH', label: 'usdt', @@ -49,7 +50,8 @@ module.exports = { const { userId } = res.locals.user; const { pageIndex = 1, pageSize = 0 } = req.query; return await Action.find({ - userId + userId, + type: { $in: [1, 2, 3] } }, actionFilter).skip((+pageIndex - 1) * +pageSize).limit(+pageSize) .exec().then(data => { return res.json({