军团活动：诸侯混战初始

shared/db/GuildActivityCity.ts

@@ -15,7 +15,7 @@ export default class GuildActivityCity extends BaseModel {
     declareGuilds: string[];       // 宣战的公会的code
 
     @prop({ required: true, default: 0 })
-    declareCnt: number;       // 宣战数量
+    declareCount: number;       // 宣战数量
 
     @prop({ required: true })
     guardGuildCode: string;       // 占领的军团的code
@@ -24,12 +24,20 @@ export default class GuildActivityCity extends BaseModel {
     guardGuildName: string;       // 占领的军团名
 
 
+    // 每天宣战一次
+    public static async getAllCities(serverId: number) {
+        let today = getTodayZeroDate();
+        let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, createdAt: { $gte: today }}).lean();
+
+        return rec;
+    }
+
     // 每天宣战一次
     public static async declare(serverId: number, cityId: number, guildCode: string) {
         let today = getTodayZeroDate();
         let rec: GuildActivityCityType = await GuildActivityCityModel.findOneAndUpdate(
             { serverId, cityId, createdAt: { $gte: today }, declareGuilds: { $nin: [guildCode] }}, 
-            { $setOnInsert: { cityId }, $push: { declareGuilds: guildCode }, $inc: {declareCnt: 1 } }, 
+            { $setOnInsert: { cityId }, $push: { declareGuilds: guildCode }, $inc: {declareCount: 1 } }, 
             {new: true, upsert: true}).lean();
 
         return rec;