From 09a5c94c0e65c0fc44aa835bbb9ca81e51c54b92 Mon Sep 17 00:00:00 2001 From: luying Date: Sat, 16 Jul 2022 13:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E6=9C=88=E5=8D=A1?= =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=BA=8C=E4=B8=AA=E6=9C=88=E5=A4=A9=E6=95=B0?= =?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/ActivityMonthlyTicket.ts | 2 +- shared/domain/activityField/monthlyTicketField.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/db/ActivityMonthlyTicket.ts b/shared/db/ActivityMonthlyTicket.ts index c1e4bf429..04e021345 100644 --- a/shared/db/ActivityMonthlyTicket.ts +++ b/shared/db/ActivityMonthlyTicket.ts @@ -33,7 +33,7 @@ export default class Activity_Monthly_Ticket extends BaseModel { //查询月卡详情 public static async findMonthlyTicket(serverId: number, roleId: string, activityId: number) { - let result: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findOne({ serverId, roleId, activityId }).lean(true); + let result: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findOne({ serverId, roleId, activityId }).sort({ endTime: -1 }).lean(true); return result; } diff --git a/shared/domain/activityField/monthlyTicketField.ts b/shared/domain/activityField/monthlyTicketField.ts index 829341b09..aaecd1a2e 100644 --- a/shared/domain/activityField/monthlyTicketField.ts +++ b/shared/domain/activityField/monthlyTicketField.ts @@ -66,6 +66,7 @@ export class MonthlyTicketData extends ActivityBase { if (data.isForever || moment(new Date).valueOf() < this.cardEndTime) { this.isOpen = true; this.todayIndex = deltaDays(moment(data.createdAt).startOf('d').add(REFRESH_TIME, 'h').toDate(), new Date) + 1; + this.days = deltaDays(moment(data.createdAt).startOf('d').add(REFRESH_TIME, 'h').toDate(), new Date(this.cardEndTime)); } else { this.todayIndex = 0; }