Merge branch 'fix/conglinshoulie' into dev

src/public/scheduler/scheduler_clsl.ts

@@ -1,6 +1,6 @@
 import {PublicShared} from '../../shared/public/public';
 import {EmailFun} from '../email';
-import { RankClslCross, RankClslCrossInit } from '../rank/rank_clsl';
+import {RankClslCross} from '../rank/rank_clsl';
 import {Scheduler, schedulerType} from './scheduler';
 
 /**
@@ -25,7 +25,9 @@ export class SchedulerClslLocalCtor extends Scheduler {
 
         // 修改clslCrossUser表中的uid为del_uid_week 并且 设置ttltime为当前时间
         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();
     }
 }
+
 /**
  * 丛林猎手赛季划分
  * 达到王者段位的所有玩家 按照创号时间从早到晚排序 每100个玩家划分一个区间
@@ -60,7 +63,9 @@ export class SchedulerClslCrossCtor extends Scheduler {
 
     async start() {
         let week = PublicShared.getToWeek();
-        let users = await G.mongodb.collection('clslCrossUser').find({}, {
+        let users = await G.mongodb.collection('clslCrossUser').find({
+            ttltime: {$exists: false}
+        }, {
             projection: {
                 "uid": 1,
                 "allStar": 1,
@@ -92,7 +97,8 @@ export class SchedulerClslCrossCtor extends Scheduler {
                     groups['group' + i].et = G.time + 7 * 14 * 3600;
                     groups['group' + i].users = wzusers.slice((i - 1) * this.num).map(u => u.uid);
                 }
-            };
+            }
+            ;
         } else {
             groups['group0'] = {
                 st: 0,