Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server

shared/consts/constModules/guildConst.ts

@@ -124,6 +124,10 @@ export enum GUILD_DATA_NAME {
     GUILD = 'Guild',
     GUILD_REFINE = 'GuildRefine',
     GUILD_ASSIST_REFINE = 'GuildAssistRefine',
+    UP_STRUCTURE = 'GuildStructure',
+    JOIN_GUILD = 'JoinGuild',
+    REFRESH_ACTIVE = 'GuildRefActive',
+    WEEKLY_GUILD_SUM = 'WeeklyGuildSum',   // 每周结算活跃和奖励
 }
 
 export const GUILD_REPORT_NUM = 40;

shared/consts/statusCode.ts

@@ -147,6 +147,7 @@ export const STATUS = {
     GUILD_ACTIVE_BOX_NOT_FOUND: { code: 20918, simStr: '未找到该活跃宝箱' },
     GUILD_ACTIVE_POINT_NOT_REACH: { code: 20919, simStr: '军团活跃值不足' },
     GUILD_ACTIVE_BOX_HAS_RECEIVED: { code: 20920, simStr: '该活跃宝箱已领取' },
+    GUILD_WEEKLY_SUM: { code: 20921, simStr: '正在周结算中' },
 
     GUILD_SCRIPT_IS_OPENED_TODAY: { code: 20950, simStr: '今日演武场已开启' },
     GUILD_SCRIPT_NOT_OPENED: { code: 20951, simStr: '演武场未开启' },

shared/db/ErrLog.ts

@@ -0,0 +1,26 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { genCode } from '../pubUtils/util'
+
+/**
+  * 自增 ID
+*/
+@index({ name: 1 })
+export default class ErrLog extends BaseModel {
+
+  @prop({ required: true })
+  code: string;
+
+  @prop({ required: true, default: "" })
+  desc: string;
+
+  public static async create(desc: string) {
+      let code = genCode(12);
+      await ErrLogModel.insertMany({ code, desc });
+  }
+
+}
+
+export const ErrLogModel = getModelForClass(ErrLog);
+
+export interface ErrLogType extends Pick<DocumentType<ErrLog>, keyof ErrLog>{};

shared/db/Guild.ts

@@ -3,7 +3,7 @@ import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typ
 import Role, { RoleType } from './Role';
 import { genCode } from '../pubUtils/util';
 import { GUILD_STRUCTURE, GUILD_STATUS, GUILD_PER_PAGE } from '../consts';
-import { getCurWeekTime } from '../pubUtils/timeUtil';
+import { getCurWeekTime, nowSeconds } from '../pubUtils/timeUtil';
 
 class Structure {
     @prop({ required: true })
@@ -60,7 +60,7 @@ export default class Guild extends BaseModel {
     @prop({ required: true, default: 0 })
     activeWeekly: number;
 
-    @prop({ required: true, default: Date.now() })
+    @prop({ required: true, default: nowSeconds() })
     activeUpdateTime: number;
     
     @prop({ required: true, default: new Date(), select: false })
@@ -93,6 +93,7 @@ export default class Guild extends BaseModel {
         delete update._id;
         const code = genCode(6);
         const result: GuildType = await GuildModel.findOneAndUpdate({ code }, update, { upsert: true, new: true })
+        .select({ _id: 0, __v: 0, createdAt: 0, updatedAt: 0 })
         .populate('leader', { roleId: 1, roleName: 1, sHid: 1, headHid: 1, lv: 1, loginTime: 1, ce: 1, title: 1, _id: 0 }, 'Role')
         .lean();
         

shared/db/UserGuildApply.ts

@@ -94,7 +94,7 @@ export default class UserGuildApply extends BaseModel {
             const lastApply = await this.findByCode(lastApplyCode);
             condition["createdAt"] = { $lt: lastApply.createdAt };
         }
-        const list: UserGuildApplyType[] = await UserGuildApplyModel.find(condition)
+        const list: UserGuildApplyType[] = await UserGuildApplyModel.find(condition, {_id: 0})
         .sort({ createdAt: -1 })
         .select('applyCode guild')
         .populate({