From 590b2b5c0af753cd18c2e2be02c964b250bfa2a4 Mon Sep 17 00:00:00 2001
From: chaosBreaking <x491807573@qq.com>
Date: Mon, 28 Oct 2019 11:05:34 +0800
Subject: [PATCH] fix: asset

---
 cn.js                               | 4 ++--
 src/jobs/mine.js                    | 8 ++++----
 src/modules/fund/fund.controller.js | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cn.js b/cn.js
index bf26f42..ce4c3ea 100644
--- a/cn.js
+++ b/cn.js
@@ -63,13 +63,13 @@ const doReward = async (user, fund) => {
             userId: user.id,
             tokenType: 'vic',
             amount: rewardMine,
-            remain: fund.asset
+            remain: fund.vicFundSum
         }).save();
         rewardInvite > 0 && createAction(2, {
             userId: user.id,
             tokenType: 'vic',
             amount: rewardInvite,
-            remain: fund.asset
+            remain: fund.vicFundSum
         }).save();
     });
 };
diff --git a/src/jobs/mine.js b/src/jobs/mine.js
index 0d17f0f..a00b6b0 100644
--- a/src/jobs/mine.js
+++ b/src/jobs/mine.js
@@ -82,9 +82,9 @@ const doReward = async (user, fund) => {
     }).then(async () => {
         rewardMine > 0 && createAction(1, {
             userId: user.id,
-            tokenType: 'vic2vic', // 新模式标记
+            tokenType: 'vic', // 新模式标记
             amount: rewardMine,
-            remain: fund.asset
+            remain: fund.vicFundSum
         }).save();
         if (user.inviter) {
             const inviter = await Fund.findOne({ userId: user.inviter });
@@ -98,9 +98,9 @@ const doReward = async (user, fund) => {
                     }),
                     createAction(4, {
                         userId: user.inviter,
-                        tokenType: 'vic2vic', // 新模式标记
+                        tokenType: 'vic', // 新模式标记
                         amount: rewardInviter,
-                        remain: fund.asset,
+                        remain: fund.vicFundSum,
                         detail: { level: 1, info: '1级奖励' }
                     }).save()
                 ]).catch((err) => mylog.error(err.errmsg));
diff --git a/src/modules/fund/fund.controller.js b/src/modules/fund/fund.controller.js
index 6ec8da7..0d85baf 100644
--- a/src/modules/fund/fund.controller.js
+++ b/src/modules/fund/fund.controller.js
@@ -135,7 +135,7 @@ module.exports = {
             });
         }
         const cost = +amount * 1.005;
-        if (fund.asset && +fund.asset[coinId] < cost) return res.json({
+        if (fund.vicFundSum < cost) return res.json({
             code: 2,
             msg: '资金不足',
             error: 'insufficient fund'
@@ -149,7 +149,7 @@ module.exports = {
             msg: '资金密码错误',
             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 });
         try {
             await fund.decFund(cost);