军团：邀请过一次当天不再显示

game-server/app/servers/battle/handler/guildHandler.ts

@@ -1,6 +1,6 @@
 import { Application, BackendSession, pinus, ChannelService } from 'pinus';
-import { resResult, getRandEelm, getRefTime } from '../../../pubUtils/util';
+import { resResult, getRandEelm, getRefTime, shouldRefresh } from '../../../pubUtils/util';
-import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, CHAT_SERVER } from '../../../consts';
+import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, CHAT_SERVER, GUILD_SELECT, USER_GUILD_SELECT } from '../../../consts';
 import { UserGuildModel } from '../../../db/UserGuild';
 import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, settleGuildWeekly } from '../../../services/guildService';
 import { GuildModel, GuildType } from '../../../db/Guild';
@@ -396,16 +396,25 @@ export class GuildHandler {
     
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
+
+        let myGuild = await UserGuildModel.getMyGuild(roleId, USER_GUILD_SELECT.ENTRY)
         // 检查权限
-        const checkResult = await checkAuth(GUILD_OPERATE.GET_INIVATION_MEMBER_LIST, roleId);
+        const checkResult = await checkAuth(GUILD_OPERATE.GET_INIVATION_MEMBER_LIST, roleId, myGuild.guildCode, myGuild);
         if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
 
+        let guild = await GuildModel.findByCode(myGuild.guildCode, serverId, GUILD_SELECT.INVITED_MEMBER);
+        let invitedMembers = guild.invitedMembers;
+        if(shouldRefresh(guild.inviteTime, new Date(), 0)) {
+            invitedMembers = [];
+        }
+
         // 离线时间，三天内在线且尚未加入军团。按以下规则排序  离线时间 玩家等级 玩家战力
         
         const day = getBeforeDaySeconds(3);
 
         const { quitGuildTime: quitTime = 0 } = await RoleModel.findByRoleId(roleId);
-        const allList = await RoleModel.getInviteList(day, serverId);
+        let allList = await RoleModel.getInviteList(day, serverId);
+        allList = allList.filter(cur => !invitedMembers.includes(cur.roleId))
         let list = getRandEelm(allList, 10);
         if(!list.length) list = allList;
 
@@ -430,7 +439,7 @@ export class GuildHandler {
         const checkResult = await checkAuth(GUILD_OPERATE.INVATE_MEMBER, roleId, code);
         if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
 
-        const guild = await GuildModel.findByCode(code, serverId);
+        const guild = await GuildModel.findByCode(code, serverId, GUILD_SELECT.INVITED_MEMBER);
         if(guild.isMemberMax) return resResult(STATUS.GUILD_MEMBER_MAX);
 
         const roleList = await RoleModel.findRoleByField('roleId', roleIds);
@@ -442,8 +451,9 @@ export class GuildHandler {
                 result.push(role.roleId);
                 let hisSid = await getRedis(`login_roleId_${role.roleId}`);
                 uids.push({ uid: role.roleId, sid: hisSid })
-                }
+            }
         }
+        await GuildModel.recordInvitedMember(code, serverId, roleIds, shouldRefresh(guild.inviteTime, new Date(), 0));
         this.channelService.pushMessageByUids('onGuildInvite', resResult(STATUS.SUCCESS, { code }), uids);
 
         return resResult(STATUS.SUCCESS, { roleIds: result });

shared/consts/constModules/selectConst.ts

@@ -32,9 +32,12 @@ export enum USER_GUILD_SELECT {
 }
 
 export enum GUILD_SELECT {
-   ENTRY = 'guildCode lv memberCnt'
+   // 初始登录
+   ENTRY = 'guildCode lv memberCnt',
+   // 获得邀请列表
+   INVITED_MEMBER = '_id code isMemberMax +invitedMembers +inviteTime'
 }
 
 export enum FRIEND_SHIP_SELECT {
     GET_FRIEND_VALUE = 'friendValue friendLv'
-}
+}

shared/db/Guild.ts

@@ -2,9 +2,10 @@ import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typegoose';
 import Role, { RoleType } from './Role';
 import { genCode } from '../pubUtils/util';
-import { GUILD_STRUCTURE, GUILD_STATUS, GUILD_PER_PAGE } from '../consts';
+import { GUILD_STRUCTURE, GUILD_STATUS, GUILD_PER_PAGE, GUILD_SELECT } from '../consts';
 import { getCurWeekTime, nowSeconds } from '../pubUtils/timeUtil';
 import { reduceCe } from '../pubUtils/util';
+import { now } from 'underscore';
 
 class Structure {
     @prop({ required: true })
@@ -71,13 +72,18 @@ export default class Guild extends BaseModel {
     guildCe: number;                         // 总战力
 
     @prop({ required: true, type: String, default: [], select: false })
-    members: string[];                  // 军团成员的roleId，用于增加战力的时候加入总战力
+    members: string[];                     // 军团成员的roleId，用于增加战力的时候加入总战力
+
+    @prop({ required: true, type: String, default: [], select: false })
+    invitedMembers: string[];               // 今天已邀请的玩家
+    @prop({ required: true, default: new Date(), select: false })
+    inviteTime: Date;               // 今天已邀请的玩家
 
     @prop({ required: true, type: Structure, default: getInitStructure(), _id: false })
     structure: Structure[]
 
     @prop({ required: true, default: GUILD_STATUS.RUNNING, enum: GUILD_STATUS })
-    status: number;
+    status: number;                      // 军团状态
 
     @prop({ required: true, default: 1, select: false })
     serverId: number;                 // 分服
@@ -212,6 +218,21 @@ export default class Guild extends BaseModel {
         const result = await GuildModel.findOneAndUpdate({ code, status: GUILD_STATUS.RUNNING, serverId, resetTrainTime:{$ne:time}},{$set: {trainId: 1, resetTrainTime: time, trainLv}}, {new: true}).lean(lean);
         return result;
     }
+
+    // 记录已邀请过的人
+    public static async recordInvitedMember(code: string, serverId: number, roleIds: string[], shouldRefresh: boolean) {
+        let result: GuildType;
+        if(shouldRefresh) {
+            result = await GuildModel.findOneAndUpdate( { code, serverId }, { $set: { invitedMembers: roleIds, inviteTime: new Date() }}, { new: true})
+            .select(GUILD_SELECT.INVITED_MEMBER)
+            .lean();
+        } else {
+            result = await GuildModel.findOneAndUpdate( { code, serverId }, { $push: { invitedMembers: { $each: roleIds } }, $set: { inviteTime: new Date() }}, { new: true})
+            .select(GUILD_SELECT.INVITED_MEMBER)
+            .lean();
+        }
+        return result;
+    }
 }
 
 export const GuildModel = getModelForClass(Guild);

shared/db/GuildRec.ts

@@ -27,7 +27,7 @@ export default class GuildRec extends BaseModel {
 
     public static async createGuildRec(roleId: string, guildCode: string, type: number, params: string[]) {
         const doc = new GuildRecModel();
-        const update = Object.assign(doc.toJSON(), { roleId, guildCode, type, params });
+        const update = Object.assign(doc.toJSON(), { roleId, guildCode, type, params, createTime: nowSeconds() });
         delete update._id;
         const recCode = genCode(10);
         const result: GuildRecType = await GuildRecModel.findOneAndUpdate({ recCode }, update, { upsert: true, new: true }).lean();

shared/db/Role.ts

@@ -439,7 +439,12 @@ export default class Role extends BaseModel {
         return result;
     }
 
-    // 获取未加入公会且登录时间在三天内的人
+    /**
+     * 获取未加入公会且登录时间在三天内的人
+     * @param time 
+     * @param serverId 
+     * @param invitedMembers 当天已邀请过的人
+     */
     public static async getInviteList(time: number, serverId: number) {
         const result = await RoleModel.find({ loginTime: { $gt: time }, hasGuild: false, serverId })
         .select('roleId roleName ce headHid sHid lv title job quitTime')