From a360f03a816af9380dfa0b2e60877bec206d4f66 Mon Sep 17 00:00:00 2001 From: chaosBreaking Date: Tue, 3 Sep 2019 21:07:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=94=B9=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8E=9F=E5=9E=8B=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/msgCode/msgCode.controller.js | 2 +- src/modules/msgCode/msgCode.model.js | 2 +- src/modules/user/user.model.js | 28 ----------------------- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/modules/msgCode/msgCode.controller.js b/src/modules/msgCode/msgCode.controller.js index be142f1..9709d82 100644 --- a/src/modules/msgCode/msgCode.controller.js +++ b/src/modules/msgCode/msgCode.controller.js @@ -27,7 +27,7 @@ module.exports = { sendSMS(phone, { msgParam: { code }, templateCode: 'SMS_142465215', - signName: 'TIC钱包管家' + signName: '第五维度' }), this.saveCode({ id: phone, diff --git a/src/modules/msgCode/msgCode.model.js b/src/modules/msgCode/msgCode.model.js index afd518f..319cc7e 100644 --- a/src/modules/msgCode/msgCode.model.js +++ b/src/modules/msgCode/msgCode.model.js @@ -19,7 +19,7 @@ const CodeSchema = new mongoose.Schema({ expiresAt: { type: Date, default: Date.now, - expires: 3600 + expires: 600 } }, { timestamps: { diff --git a/src/modules/user/user.model.js b/src/modules/user/user.model.js index aaf8c7e..ff1c5fe 100644 --- a/src/modules/user/user.model.js +++ b/src/modules/user/user.model.js @@ -1,7 +1,6 @@ 'use strict'; const mongoose = require('mongoose'); -const ASSETTYPES = ['log', 'profit', 'usdtBTC', 'usdtETH', 'usdtTRX']; const UserSchema = new mongoose.Schema({ phone: { @@ -40,31 +39,4 @@ const UserSchema = new mongoose.Schema({ const UserModel = mongoose.model('User', UserSchema); -UserModel.prototype.increase = async function (assetName, amount, option = {}) { - if (!assetName || !amount || amount <= 0 || !Number.isFinite(amount) || !ASSETTYPES.includes(assetName)) return null; - const asset = 'asset.' + assetName; - const res = await UserModel.findByIdAndUpdate(this.id, { - $inc: { - [asset]: amount - } - }, { ...option, returnOriginal: false }).exec().catch(err => null); - if (!res || !res.asset) throw new Error('用户资产修改[increase]失败!'); - if (res.asset[assetName] < 0) throw new Error('Insufficient funds'); - return res; -}; -UserModel.prototype.decrease = async function (assetName, amount, option) { - // 传入的amount应该是大于0的正数 - if (!assetName || !amount || amount <= 0 || !Number.isFinite(amount) || !ASSETTYPES.includes(assetName)) return null; - amount = 0 - amount; - const asset = 'asset.' + assetName; - const res = await UserModel.findByIdAndUpdate(this.id, { - $inc: { - [asset]: amount - } - }, { ...option, returnOriginal: false }).exec().catch(err => null); - if (!res || !res.asset) throw new Error('用户资产修改[decrease]失败!'); - if (res.asset[assetName] < 0) throw new Error('Insufficient funds'); - return res; -}; - module.exports = UserModel; \ No newline at end of file