From de95614abcd905f5182fa85dcbf37e17f8a8a4c5 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 2 Feb 2021 14:22:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/UserGuild.ts | 6 +++--- shared/db/WishPoolReport.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shared/db/UserGuild.ts b/shared/db/UserGuild.ts index f280421d4..0608d6c62 100644 --- a/shared/db/UserGuild.ts +++ b/shared/db/UserGuild.ts @@ -188,17 +188,17 @@ export default class UserGuild extends BaseModel { return userGuilds; } - public static async pushAndUpdate(roleId: string, update: UserGuildUpdateParam, pushData:{wishGoods?: WishGood}, select?: string, lean = true) { + public static async pushAndUpdate(roleId: string, update: UserGuildUpdateParam, pushData:{wishGoods?: WishGood}, select?: string) { const result: UserGuildType = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON }, { $set: update, $push: pushData }, { new: true }).select(select).lean(); return result; } - public static async donateGoods(roleId: string, wishDntCnt: number, select?: string, lean = true) { + public static async donateGoods(roleId: string, wishDntCnt: number, select?: string) { const result: UserGuildType = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON }, { $inc: { wishDntCnt } }, { new: true }).select(select).lean(); return result; } - public static async donateUpdate(roleId: string, id: string, select?: string, lean = true) { + public static async donateUpdate(roleId: string, id: string, select?: string) { const result: UserGuildType = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON, 'wishGoods.id': id }, { $inc: { 'wishGoods.$.receiveCnt': 1, 'wishGoods.$.drawCnt': 1} }, { new: true }).select(select).lean(); return result; } diff --git a/shared/db/WishPoolReport.ts b/shared/db/WishPoolReport.ts index a158ce1c0..5ecc793b1 100644 --- a/shared/db/WishPoolReport.ts +++ b/shared/db/WishPoolReport.ts @@ -29,14 +29,14 @@ export default class WishPoolReport extends BaseModel { @prop({ required: true }) dntRoleName: string; //捐赠人 - public static async addReport(guildCode: string, wishRoleId: string, wishRoleName: string, dntRoleId: string, dntRoleName: string, goodId: number, count: number, lean = true) { + public static async addReport(guildCode: string, wishRoleId: string, wishRoleName: string, dntRoleId: string, dntRoleName: string, goodId: number, count: number) { const doc = new WishPoolReportModel(); const report = Object.assign(doc.toJSON(), { guildCode, wishRoleId, wishRoleName, dntRoleId, dntRoleName, goodId, dntTime: nowSeconds(), count }); await WishPoolReportModel.create(report); return report; } //获得day天之前的许愿池战报 - public static async getReportsByTime(guildCode: string, day: number, lean = true) { + public static async getReportsByTime(guildCode: string, day: number) { let time = getTodayZeroPoint() - day * 24 * 60; const reports = await WishPoolReportModel.find({ guildCode, dntTime: {$gte: time}}).sort({ dntTime : -1 }); return reports;