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

fix: asset

Browse Source
This commit is contained in:
chaosBreaking
2019-10-28 11:05:34 +08:00
parent 094a859f62
commit 590b2b5c0a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cn.js
View File

@@ -63,13 +63,13 @@ const doReward = async (user, fund) => {
userId: user.id, userId: user.id,
tokenType: 'vic', tokenType: 'vic',
amount: rewardMine, amount: rewardMine,
remain: fund.asset remain: fund.vicFundSum
}).save(); }).save();
rewardInvite > 0 && createAction(2, { rewardInvite > 0 && createAction(2, {
userId: user.id, userId: user.id,
tokenType: 'vic', tokenType: 'vic',
amount: rewardInvite, amount: rewardInvite,
remain: fund.asset remain: fund.vicFundSum
}).save(); }).save();
}); });
}; };

8
src/jobs/mine.js
View File

@@ -82,9 +82,9 @@ const doReward = async (user, fund) => {
}).then(async () => { }).then(async () => {
rewardMine > 0 && createAction(1, { rewardMine > 0 && createAction(1, {
userId: user.id, userId: user.id,
tokenType: 'vic2vic', // 新模式标记 tokenType: 'vic', // 新模式标记
amount: rewardMine, amount: rewardMine,
remain: fund.asset remain: fund.vicFundSum
}).save(); }).save();
if (user.inviter) { if (user.inviter) {
const inviter = await Fund.findOne({ userId: user.inviter }); const inviter = await Fund.findOne({ userId: user.inviter });
@@ -98,9 +98,9 @@ const doReward = async (user, fund) => {
}), }),
createAction(4, { createAction(4, {
userId: user.inviter, userId: user.inviter,
tokenType: 'vic2vic', // 新模式标记 tokenType: 'vic', // 新模式标记
amount: rewardInviter, amount: rewardInviter,
remain: fund.asset, remain: fund.vicFundSum,
detail: { level: 1, info: '1级奖励' } detail: { level: 1, info: '1级奖励' }
}).save() }).save()
]).catch((err) => mylog.error(err.errmsg)); ]).catch((err) => mylog.error(err.errmsg));

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

@@ -135,7 +135,7 @@ module.exports = {
}); });
} }
const cost = +amount * 1.005; const cost = +amount * 1.005;
if (fund.asset && +fund.asset[coinId] < cost) return res.json({ if (fund.vicFundSum < cost) return res.json({
code: 2, code: 2,
msg: '资金不足', msg: '资金不足',
error: 'insufficient fund' error: 'insufficient fund'
@@ -149,7 +149,7 @@ module.exports = {
msg: '资金密码错误', msg: '资金密码错误',
error: '资金密码错误', error: '资金密码错误',
}); });
const action = createAction(3, { userId, amount, remain: fund.asset, op: 0, detail: { targetAddress, coinId } }); const action = createAction(3, { userId, amount, remain: fund.vicFundSum, op: 0, detail: { targetAddress, coinId } });
const ticket = createTicket('withdraw', { userId, amount: +amount, action, targetAddress, coinId }); const ticket = createTicket('withdraw', { userId, amount: +amount, action, targetAddress, coinId });
try { try {
await fund.decFund(cost); await fund.decFund(cost);