Merge branch 'fix/conglinshoulie' into dev

This commit is contained in:
xichaoyin 2024-01-04 20:08:01 +08:00
commit dc45a38f4e

View File

@ -1,6 +1,6 @@
import {PublicShared} from '../../shared/public/public'; import {PublicShared} from '../../shared/public/public';
import {EmailFun} from '../email'; import {EmailFun} from '../email';
import { RankClslCross, RankClslCrossInit } from '../rank/rank_clsl'; import {RankClslCross} from '../rank/rank_clsl';
import {Scheduler, schedulerType} from './scheduler'; import {Scheduler, schedulerType} from './scheduler';
/** /**
@ -25,7 +25,9 @@ export class SchedulerClslLocalCtor extends Scheduler {
// 修改clslCrossUser表中的uid为del_uid_week 并且 设置ttltime为当前时间 // 修改clslCrossUser表中的uid为del_uid_week 并且 设置ttltime为当前时间
await G.mongodb.collection('clslCrossUser').updateMany( await G.mongodb.collection('clslCrossUser').updateMany(
{}, { $rename: { "uid": `del_uid_${week}` }, $set: { "ttltime": new Date() } } {
ttltime: {$exists: false}
}, {$rename: {"uid": `del_uid_${week}`}, $set: {"ttltime": new Date()}}
); );
// 获取分组信息 重置排行榜 // 获取分组信息 重置排行榜
@ -38,6 +40,7 @@ export class SchedulerClslLocalCtor extends Scheduler {
await this.record(); await this.record();
} }
} }
/** /**
* *
* 100 * 100
@ -60,7 +63,9 @@ export class SchedulerClslCrossCtor extends Scheduler {
async start() { async start() {
let week = PublicShared.getToWeek(); let week = PublicShared.getToWeek();
let users = await G.mongodb.collection('clslCrossUser').find({}, { let users = await G.mongodb.collection('clslCrossUser').find({
ttltime: {$exists: false}
}, {
projection: { projection: {
"uid": 1, "uid": 1,
"allStar": 1, "allStar": 1,
@ -92,7 +97,8 @@ export class SchedulerClslCrossCtor extends Scheduler {
groups['group' + i].et = G.time + 7 * 14 * 3600; groups['group' + i].et = G.time + 7 * 14 * 3600;
groups['group' + i].users = wzusers.slice((i - 1) * this.num).map(u => u.uid); groups['group' + i].users = wzusers.slice((i - 1) * this.num).map(u => u.uid);
} }
}; }
;
} else { } else {
groups['group0'] = { groups['group0'] = {
st: 0, st: 0,