🐞 fix(gvg): 激战期推送相关修改

game-server/app/services/gvg/gvgService.ts

@@ -2,7 +2,7 @@ import { pinus } from "pinus";
 import { GVGConfigModel, GVGConfigType } from "../../db/GVGConfig";
 import { getTimeFun, getZeroPoint, getZeroPointOfTime, nowSeconds, WEEK_TO_SECOND } from "../../pubUtils/timeUtil";
 import { getAllServerCreateTime, getServerCreateTime } from "../redisService";
-import { GVG_PERIOD, GVG_SERVER_TYPE, LEAGUE_JOB, SHOP_REFRESH_TYPE } from "../../consts";
+import { GVG_PERIOD, GVG_SERVER_TYPE, LEAGUE_JOB, PUSH_ROUTE, SHOP_REFRESH_TYPE } from "../../consts";
 import { GVGLeagueModel, GVGLeagueType } from "../../db/GVGLeague";
 import { GVGLeaguePrepareModel } from "../../db/GVGLeaguePrepare";
 import { GVGServerGroupModel } from "../../db/GVGServerGroup";
@@ -11,7 +11,6 @@ import { getRandSingleEelm } from "../../pubUtils/util";
 import { GVG } from "../../pubUtils/dicParam";
 import { ServerlistModel } from "../../db/Serverlist";
 import { GuildModel, GuildType } from "../../db/Guild";
-import { checkHasCities } from "./gvgBattleService";
 import { GVGLeagueApplyModel } from "../../db/GVGLeagueApply";
 import { GVGMainData, LeagueContributeInfo } from "../../domain/gvgField/returnData";
 import { Contribute, GVGUserDataModel, GVGUserDataType } from "../../db/GVGUserData";
@@ -24,6 +23,8 @@ import { calVestigeLeagueBoxRewards, getFightTimeByPeriod } from "./gvgFightServ
 import { GVGVestigeLeagueRankModel } from "../../db/GVGVestigeLeagueRank";
 import { GVGVestigeSumRankModel } from "../../db/GVGVestigeSumRank";
 import { GVGTeamModel } from "../../db/GVGTeam";
+import { sendMessageToGuildWithSuc } from "../pushService";
+import { GVGCityModel } from "../../db/GVGCity";
 
 // 定时器相关
 export async function createNewGVGConfig() {
@@ -42,13 +43,20 @@ export async function createNewGVGConfig() {
     let autoLeagues = await GVGLeagueModel.findAutoCreateLeague();
     let needDissmissLeagueId: string[] = [], needDissmissLeagueCodes: string[] = [];
     for(let league of autoLeagues) {
-        if(!await checkHasCities(league)) {
+        if(!await GVGCityModel.checkLeagueHasGuard(config.configId, league.leagueCode)) {
             needDissmissLeagueId.push(league._id);
             needDissmissLeagueCodes.push(league.leagueCode);
         }
     }
     await GVGLeagueModel.dismissByIds(needDissmissLeagueId);
     await GuildModel.leagueAutoDismiss(needDissmissLeagueCodes);
+    for(let league of autoLeagues) {
+        if(needDissmissLeagueCodes.indexOf(league.leagueCode) == -1) continue;
+        for(let guildCode of league.guildCodes) {
+            await sendMessageToGuildWithSuc(guildCode, PUSH_ROUTE.LEAGUE_DISSMISS, { leagueCode: league.leagueCode })
+        }
+    }
+
     await pinus.app.rpc.systimer.systimerRemote.initGVGConfigSchedule.broadcast();
     return config;
 }