diff --git a/src/common/rootWallet.js b/src/common/rootWallet.js index 55db6b4..d6dd881 100644 --- a/src/common/rootWallet.js +++ b/src/common/rootWallet.js @@ -2,18 +2,31 @@ // 该脚本只用于系统账户对用户进行提现转账 const { ERC20 } = require('../utils/erc20'); const { inject } = require('./Provider'); -const { USDTAddr } = require('./constant'); +// const { USDTAddr } = require('./constant'); +const crypto = require('../utils/crypto'); -const RootAccount = inject(function (SysConfig) { +const ROOTSECWORD = inject(function (SysConfig) { const { ROOTSECWORD } = SysConfig; - return ERC20.fromMnemonic(ROOTSECWORD, USDTAddr); + return ROOTSECWORD; +}); +const VICCONTRACTADDR = inject(function (SysConfig) { + const { VICCONTRACTADDR } = SysConfig; + return VICCONTRACTADDR; +}); +const VICSECWORD = inject(function (SysConfig) { + const { VICSECWORD } = SysConfig; + return VICSECWORD; }); module.exports = { async sendUSDT2User (toAddress, amount, option = {}) { - return await RootAccount.transfer(toAddress, amount, option); + const { path } = option; + const kp = crypto.secword2keypair(ROOTSECWORD, { path }); + const account = new ERC20(kp.seckey); + return await account.transfer(toAddress, amount, option); }, async sendVIC2User (toAddress, amount, option = {}) { - return await RootAccount.transfer(toAddress, amount, Object.assign(option, { decimals: 18 })); + const account = ERC20.fromMnemonic(VICSECWORD, VICCONTRACTADDR); + return await account.transfer(toAddress, amount, Object.assign(option, { decimals: 18 })); } }; diff --git a/src/modules/ticket/ticket.controller.js b/src/modules/ticket/ticket.controller.js index c55ef0d..e58b06c 100644 --- a/src/modules/ticket/ticket.controller.js +++ b/src/modules/ticket/ticket.controller.js @@ -4,9 +4,11 @@ const Ticket = require('./ticket.model'); const handleTicket = require('./ticket.handler'); module.exports = { + // 处理工单请求的api async reqHandleTicket (req, res) { - const { handler } = res.local.handler; + const { handlerId } = res.local.handler; const { id } = req.body; + // 存在性检查 const ticket = await Ticket.findById(id).exec().catch(err => { mylog.error(err); return null; @@ -15,10 +17,12 @@ module.exports = { code: 1, msg: 'unknow ticket' }); - handleTicket(ticket, handler).then(data => { + // 调用处理函数 + handleTicket(ticket, handlerId).then(data => { return res.json({ code: 0, - msg: 'success' + msg: 'success', + data: JSON.stringify(data) }); }).catch(err => { return res.json({ @@ -28,8 +32,8 @@ module.exports = { }); }, async getTicketList (req, res) { - const { pageSize, pageIndex } = req.query; - return Ticket.find().skip((pageIndex - 1) * pageSize).limit(pageSize).then(data => { + const { pageSize = 0, pageIndex = 1} = req.query; + return Ticket.find().skip((+pageIndex - 1) * +pageSize).limit(+pageSize).then(data => { return res.json({ code: 0, data diff --git a/src/modules/ticket/ticket.handler.js b/src/modules/ticket/ticket.handler.js index 586c543..e10ac4b 100644 --- a/src/modules/ticket/ticket.handler.js +++ b/src/modules/ticket/ticket.handler.js @@ -1,18 +1,31 @@ 'use strict'; const Ticket = require('./ticket.model'); const User = require('../user/user.model'); +const Fund = require('../fund/fund.model'); +const { sendUSDT2User, sendVIC2User } = require('../../common/rootWallet'); + const name2type = { withdraw: 0 }; -async function handleTicket (ticket, handler) { + +function createTicket (name, data) { + const type = name2type[name]; + const status = 'created'; + const { userId, handler, action, coinId, option } = data; + return new Ticket({ + status, type, userId, handler, action, option, coinId + }); +} + +async function handleTicket (ticket, handlerId) { // 所有工单在此处理,只要状态未完结(status !== 'finished'),就可以多次调用改变状态。 const { userId, status } = ticket; const user = await User.findById(userId).exec(); if (!user) return null; - ticket = await ticket.next(handler); + ticket = await ticket.next(handlerId); if (status === 'processing') { await dealTicket(ticket, user); - await ticket.next(handler); + await ticket.next(handlerId); return ticket; } return null; @@ -20,22 +33,18 @@ async function handleTicket (ticket, handler) { async function dealTicket (ticket, user) { if (ticket.type === 0) { // 提现 - dealWithdraw(ticket, user); + return await dealWithdraw(ticket, user); } } async function dealWithdraw (ticket, user) { - + // userId, amount: +amount, action, targetAddress + const { userId, amount, targetAddress, coinId } = ticket; + const fund = await Fund.findOne({ userId }).exec(); + const { path } = fund.tokenAddress['usdtETH']; + return coinId === 'usdt' ? sendUSDT2User(targetAddress, amount, {path}) : sendVIC2User(targetAddress, amount) } -function createTicket (name, data) { - const type = name2type[name]; - const status = 'created'; - const { userId, handler, action, option } = data; - return new Ticket({ - status, type, userId, handler, action, option - }); -} module.exports = { createTicket, diff --git a/src/modules/ticket/ticket.model.js b/src/modules/ticket/ticket.model.js index a090709..bbe2c19 100644 --- a/src/modules/ticket/ticket.model.js +++ b/src/modules/ticket/ticket.model.js @@ -11,6 +11,9 @@ const TicketSchema = new mongoose.Schema({ // 订单类型 type: String, }, + coinId: { + type: String + }, amount: { type: Number },