炼器堂，练兵场，事件开启，redlock注释

shared/consts/statusCode.ts

@@ -177,7 +177,7 @@ export const STATUS = {
     GUILD_LIGHT_UP_THE_SCIENCETREE: { code: 20964, simStr: '军团已经点亮此科技' },
     GUILD_SCIENCETREE_IS_RUNNING: { code: 20965, simStr: '军团正在进行研发，不能点亮' },
     GUILD_IS_ASSISTED_SCIENCETREE: { code: 20966, simStr: '玩家已经协助过该科技树' },
-    GUILD_REACH_MAX_ASSIST_COUNT: { code: 20967, simStr: '已经达到协助的最大次数' },
+    GUILD_REACH_MAX_ASSIST_COUNT: { code: 20967, simStr: '协助的人数已经达到最大' },
     GUILD_TRAIN_IS_NOT_COMPLETE: { code: 20968, simStr: '军团该训练场没有完成' },
     GUILD_TRAIN_QUALITY_REWARD_IS_GOT: { code: 20969, simStr: '军团训练进阶奖励已经领取' },
     GUILD_PERSITION_TREE_NOT_LIGHT: { code: 20970, simStr: '军团前置科技树未研发' },

shared/db/GMMail.ts

@@ -3,14 +3,15 @@ import { getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { nowSeconds } from '../pubUtils/timeUtil';
 
 class RewardInter {
+    @prop({ required: true })
     id: number;
+    @prop({ required: true })
     count: number;
 }
+
 class SendRole {
     @prop({ required: true })
     roleId: string;
-    @prop({ required: true })
-    status: number;
 }
 
 export default class GMMail extends BaseModel {

shared/db/GroupMail.ts

@@ -5,7 +5,9 @@ import { MAIL_STATUS, MAIL_TYPE } from '../consts/constModules/mailConst';
 import { findWhere } from 'underscore';
 const { ObjectId } = mongoose.Types;
 class RewardInter {
+    @prop({ required: true })
     id: number;
+    @prop({ required: true })
     count: number;
 }
 class SendRole {

shared/db/Guild.ts

@@ -212,7 +212,13 @@ export default class Guild extends BaseModel {
         const result = await GuildModel.findOneAndUpdate({ members: { $elemMatch: { $eq: roleId } }, status: GUILD_STATUS.RUNNING}, {$inc: {guildCe: inc}}, {new: true}).lean({getters: true});
         return result;
     }
-
+    /**
+     * 每周一，5点刷新,若满足刷新条件，则重置试炼等级并返回
+     * @param code 
+     * @param serverId 
+     * @param trainLv 
+     * @param lean 
+     */
     public static async resetGuildTrain(code: string, serverId: number, trainLv: number, lean = true) {
         const time = getCurWeekTime(1, 5);//每周一，5点刷新
         const result = await GuildModel.findOneAndUpdate({ code, status: GUILD_STATUS.RUNNING, serverId, resetTrainTime:{$ne:time}},{$set: {trainId: 1, resetTrainTime: time, trainLv}}, {new: true}).lean(lean);

shared/db/GuildTrainReport.ts

@@ -15,7 +15,7 @@ class Report {
     @prop({ required: true })
     difficulty: number;
     @prop({ required: true })
-    type: number;//1表示普通战报， 2表示系统战报即：被成功压制
+    type: number;//1：失败， 2：成功，3：表示系统战报即：被成功压制
 }
 @index({guildCode: 1, trainId: 1})
 

shared/db/Mail.ts

@@ -34,7 +34,7 @@ export default class Mail extends BaseModel {
     status: number;
 
     @prop({ required: true })
-    mailTemType: number; //1:表示模板邮件，2：表示系统邮件    
+    mailTemType: number; //1:表示从gm下发的邮件，2：表示系统邮件   
 
     @prop({ required: true })
     sendName: string;