From 85197ffc31f445a3bf2896ecd8a21d0a79407d84 Mon Sep 17 00:00:00 2001 From: luying Date: Wed, 22 Mar 2023 16:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=91=A8=E6=9C=9F=E5=88=B6=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/GVGUserTask.ts | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/shared/db/GVGUserTask.ts b/shared/db/GVGUserTask.ts index 6750cb62d..48f1b2c7c 100644 --- a/shared/db/GVGUserTask.ts +++ b/shared/db/GVGUserTask.ts @@ -1,6 +1,5 @@ import BaseModel from './BaseModel'; import { index, getModelForClass, prop, DocumentType, } from '@typegoose/typegoose'; -import { getZeroPointD } from '../pubUtils/timeUtil'; import { TASK_FUN_TYPE } from '../consts'; import { UpdateTaskParam } from '../domain/roleField/task'; @@ -29,20 +28,17 @@ export default class GVGUserTask extends BaseModel { status: number; // 1-未领取 2-已领取 public static async findByRole(configId: number, leagueCode: string, roleId: string) { - let today = getZeroPointD(); - const result: GVGUserTaskType[] = await GVGUserTaskModel.find({ configId, leagueCode, roleId, createdAt: { $gte: today } }, { _id: 0, id: 1, count: 1, status: 1 }).lean(); + const result: GVGUserTaskType[] = await GVGUserTaskModel.find({ configId, leagueCode, roleId }, { _id: 0, id: 1, count: 1, status: 1 }).lean(); return result; } public static async setTaskRec(configId: number, leagueCode: string, roleId: string, taskType: number, taskId: number, count: number) { - let today = getZeroPointD(); - let rec: GVGUserTaskType = await GVGUserTaskModel.findOneAndUpdate({ configId, leagueCode, roleId, id: taskId, createdAt: { $gte: today } }, { $setOnInsert: { taskType, status: 1 }, $set: { count } }, { new: true, upsert: true }).lean(); + let rec: GVGUserTaskType = await GVGUserTaskModel.findOneAndUpdate({ configId, leagueCode, roleId, id: taskId }, { $setOnInsert: { taskType, status: 1 }, $set: { count } }, { new: true, upsert: true }).lean(); return rec; } public static async incTaskRec(configId: number, leagueCode: string, roleId: string, taskType: number, taskId: number, count: number) { - let today = getZeroPointD(); - let rec: GVGUserTaskType = await GVGUserTaskModel.findOneAndUpdate({ configId, leagueCode, roleId, id: taskId, createdAt: { $gte: today } }, { $setOnInsert: { taskType, status: 1 }, $inc: { count } }, { new: true, upsert: true }).lean(); + let rec: GVGUserTaskType = await GVGUserTaskModel.findOneAndUpdate({ configId, leagueCode, roleId, id: taskId }, { $setOnInsert: { taskType, status: 1 }, $inc: { count } }, { new: true, upsert: true }).lean(); return rec; } @@ -55,14 +51,12 @@ export default class GVGUserTask extends BaseModel { } public static async findByTaskId(configId: number, leagueCode: string, roleId: string, taskId: number) { - let today = getZeroPointD(); - let rec: GVGUserTaskType = await GVGUserTaskModel.findOne({ configId, leagueCode, roleId, id: taskId, createdAt: { $gte: today } }).lean(); + let rec: GVGUserTaskType = await GVGUserTaskModel.findOne({ configId, leagueCode, roleId, id: taskId }).lean(); return rec; } public static async receiveTask(configId: number, leagueCode: string, roleId: string, taskId: number) { - let today = getZeroPointD(); - let rec: GVGUserTaskType = await GVGUserTaskModel.findOneAndUpdate({ configId, leagueCode, roleId, id: taskId, createdAt: { $gte: today } }, { $set: { status: 2 } }, { new: true }).lean(); + let rec: GVGUserTaskType = await GVGUserTaskModel.findOneAndUpdate({ configId, leagueCode, roleId, id: taskId }, { $set: { status: 2 } }, { new: true }).lean(); return rec; } }