获取列表,申请,同意

This commit is contained in:
luying
2021-01-19 21:06:04 +08:00
parent ee21a21e80
commit ac081059c2
8 changed files with 248 additions and 14 deletions
+11 -2
View File
@@ -95,7 +95,7 @@ export default class Guild extends BaseModel {
}
public static async findByCondition(page: number, showPeopleMax: boolean, name: string) {
const condition = {};
const condition = { status: GUILD_STATUS.RUNNING };
if(!showPeopleMax) {
condition['isMemberMax'] = false;
}
@@ -103,6 +103,7 @@ export default class Guild extends BaseModel {
condition['name'] = { $regex: new RegExp(name, 'i') }
}
const guildList = await GuildModel.find(condition)
.sort({ lv: -1, ce: -1 })
.limit(GUILD_PER_PAGE).skip((page - 1) * GUILD_PER_PAGE)
.select('code icon name lv memberCnt leader ceLimit isAuto')
.populate('leader', 'roleName', 'Role')
@@ -111,11 +112,19 @@ export default class Guild extends BaseModel {
}
public static async findByCode(code: string) {
const result = await GuildModel.findOne({ code, status: GUILD_STATUS.RUNNING }, { _id: 0 })
const result = await GuildModel.findOne({ code, status: GUILD_STATUS.RUNNING })
.populate('leader', 'roleName sHid headHid lv loginTime ce', 'Role')
.lean();
return result;
}
public static async addGuild(code: string, roleId: string, maxMemberCnt: number) {
let result = await GuildModel.findOneAndUpdate({ code, memberCnt: {$lt: maxMemberCnt } }, { $inc: { memberCnt: 1 }, $push: { members: roleId } }, { new: true }).lean();
if(result && result.memberCnt >= maxMemberCnt) {
result = await GuildModel.findOneAndUpdate({ code }, { $set: { isMemberMax: true } }).lean();
}
return result;
}
}
export const GuildModel = getModelForClass(Guild);