排行榜：修复数据错误

shared/db/Guild.ts

@@ -72,6 +72,9 @@ export default class Guild extends BaseModel {
 
     @prop({ required: true, default: 0, get: (val:number) => reduceCe(val), set: (val: number) => val })
     guildCe: number;                         // 总战力
+    
+    @prop({ required: false, set: (val: boolean) => val, get: () => true })
+    isReducedCe: boolean;                 // 如果战力没有缩过就会返回false，缩过了就会返回true
 
     @prop({ required: true, type: String, default: [], select: false })
     members: string[];                     // 军团成员的roleId，用于增加战力的时候加入总战力
@@ -139,7 +142,7 @@ export default class Guild extends BaseModel {
         let sort = {}, condition = {};
         switch(type) {
             case REDIS_KEY.GUILD_LV_RANK:
-                sort = { lv: -1, lvUpdateTime: 1 }; break;
+                sort = { lv: -1, activeWeekly: -1, lvUpdateTime: 1 }; break;
             case REDIS_KEY.GUILD_ACTIVE_RANK:
                 sort = { activeWeekly: -1, activeUpdateTime: 1 }; condition = { activeWeekly: { $gt: 0 } }; break;
         }

shared/domain/rank.ts

@@ -177,14 +177,27 @@ export class GuildRankParam {
     @prop({ required: true })
     guildCe: number;
 
-    constructor(guild: GuildUpdateParam) {
+    constructor(guild: GuildUpdateParam, fromDb: boolean) {
         this.icon = guild.icon;
         this.name = guild.name;
         this.lv = guild.lv;
         let leader = <RoleType>guild.leader;
         let _leader = new GuildLeader(leader);
         this.leader = _leader;
-        this.guildCe = guild.guildCe;
+        console.log('*****', guild.isReducedCe, guild.guildCe, reduceCe(guild.guildCe))
+        if(guild.isReducedCe) {
+            this.guildCe = guild.guildCe;
+        } else {
+            this.guildCe = reduceCe(guild.guildCe);
+        }
+
+        if(fromDb && !(<GuildUpdateParam>guild).isReducedCe) {
+            this.guildCe = reduceCe(guild.guildCe);
+        } else {
+            this.guildCe = guild.guildCe;
+        }
+
+
         this.memberCnt = guild.memberCnt;
     }
 }