红点：修改推送方式

game-server/app/services/guildTrainService.ts

@@ -1,9 +1,9 @@
-import { UserGuildModel } from '../db/UserGuild';
+import { UserGuildModel, UserGuildType } from '../db/UserGuild';
 import { getArmyTrainJuDian, getTrainBaseByLv } from '../pubUtils/data';
 import { nowSeconds, getZeroPoint } from '../pubUtils/timeUtil';
 import { GUILD_STRUCTURE } from '../consts';
 import { GuildTrainType, GuildTrainModel, TrainInstance } from '../db/GuildTrain';
-import { GuildModel } from '../db/Guild';
+import { GuildModel, GuildType } from '../db/Guild';
 import { findWhere } from 'underscore';
 import { ARMY } from '../pubUtils/dicParam';
 import { lockData } from './redLockService';
@@ -184,4 +184,23 @@ export async function checkResetTrain(roleId: string, serverId: number) {
  */
 export async function removeTrainRank(guildCode: string, roleId: string, trainId: number) {
     await GuildTrainModel.removeTrainRank(guildCode, roleId, trainId);
+}
+
+/**
+ * 获取军团练兵场
+ * @param roleId 
+ * @param guild 
+ * @param userGuild 
+ */
+export async function getGuildTrainInstance(roleId: string, guild: GuildType, userGuild: UserGuildType) {
+    let { trainId, trainLv, code } = guild;
+    let guildTrain = await GuildTrainModel.findTrainByTrainIdNotLock(code, trainId);
+    if (!guildTrain) {
+        guildTrain = await unlockTrain(code, trainId);
+    }
+    let { trainCount, trainRewards, buyTrainCount } = userGuild;
+    let result: any = getGuildTrainInfo(guildTrain, roleId, trainCount, trainRewards);
+    result.buyTrainCount = buyTrainCount || 0;
+    result.trainLv = trainLv;
+    return result;
 }