活动:修复限时排行榜
This commit is contained in:
@@ -43,23 +43,22 @@ export default class Activity extends BaseModel {
|
||||
|
||||
// 获取正在开启和即将到来的活动列表
|
||||
public static async findOpenAndComingActivityes() {
|
||||
let now = new Date();
|
||||
let result: ActivityModelType[] = await ActivityModel.find({ endTime: { $gte: now } }).lean();
|
||||
let result: ActivityModelType[] = await ActivityModel.find({ isEnable: true }).lean();
|
||||
return result;
|
||||
}
|
||||
|
||||
//根据活动类型查询开启的活动数据
|
||||
public static async findOpenActivityByType(activityGroupId: number[], type: number, date: Date) {
|
||||
public static async findOpenActivityByType(activityGroupId: number[], type: number) {
|
||||
let result: ActivityModelType[] = await ActivityModel.find(
|
||||
{ groupId: { $in: activityGroupId }, type, beginTime: { $lte: date }, endTime: { $gte: date } }
|
||||
{ groupId: { $in: activityGroupId }, type, isEnable: true }
|
||||
).sort({ activityId: -1 }).lean(true);
|
||||
return result;
|
||||
}
|
||||
|
||||
//根据活动类型查询开启的活动数据
|
||||
public static async findOpenActivityByTypes(activityGroupId: number[], types: number[], date: Date) {
|
||||
public static async findOpenActivityByTypes(activityGroupId: number[], types: number[]) {
|
||||
let result: ActivityModelType[] = await ActivityModel.find(
|
||||
{ groupId: { $in: activityGroupId }, type: { $in: types }, beginTime: { $lte: date }, endTime: { $gte: date } }
|
||||
{ groupId: { $in: activityGroupId }, type: { $in: types }, isEnable: true }
|
||||
).sort({ activityId: -1 }).lean(true);
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user