军团活动：修复粮草先行

2021-03-30 18:07:04 +08:00
parent ba5e139bee
commit 0d7a873a34
16 changed files with 202 additions and 104 deletions
@@ -34,6 +34,13 @@ export default class GuildActivityCity extends BaseModel {
        return rec;
    }

+    public static async getCity(serverId: number, cityId: number) {
+        let curWeek = getCurWeekDate(1, 0);
+        let rec: GuildActivityCityType = await GuildActivityCityModel.findOne({ serverId, cityId, createdAt: { $gte: curWeek }}).lean();
+        
+        return rec;
+    }
+
    // 检查是否宣战过
    public static async checkDeclartion(serverId: number, guildCode: string) {
        let curWeek = getCurWeekDate(1, 0);
@@ -59,7 +66,18 @@ export default class GuildActivityCity extends BaseModel {
        let curWeek = getCurWeekDate(1, 0);
        let rec: GuildActivityCityType = await GuildActivityCityModel.findOneAndUpdate(
            { serverId, cityId, createdAt: { $gte: curWeek } }, 
-            { $set: { declareCount: 0, declareGuilds: [], guardGuildCode: guildCode, guardGuildName: guildName, guardTime: new Date()} }, 
+            { $set: { guardGuildCode: guildCode, guardGuildName: guildName, guardTime: new Date()} }, 
+            { new: true }).lean();
+
+        return rec;
+    }
+
+    // 活动结束后需要清空占领情况
+    public static async clearGuard(serverId: number, cityId: number) {
+        let curWeek = getCurWeekDate(1, 0);
+        let rec: GuildActivityCityType = await GuildActivityCityModel.findOneAndUpdate(
+            { serverId, cityId, createdAt: { $gte: curWeek } }, 
+            { $set: { guardGuildCode: "", guardGuildName: "", declareCount: 0, declareGuilds: [] } }, 
            { new: true }).lean();

        return rec;