This commit is contained in:
aozhiwei 2024-04-19 10:48:54 +08:00
parent f7d6bde2e4
commit bfce47f8cc

View File

@ -322,13 +322,28 @@ func (this *guildMgr) AsyncGetApplyList(lastIdx int64, accountId string,
}
func (this *guildMgr) AsyncApplyJoin(accountId string, guildId string, cb func(int32, string)) {
guild := this.internalGetGuildByAccountId(accountId)
if guild != nil {
if this.internalGetGuildByAccountId(accountId) != nil {
cb(0, "")
return
}
guild := this.internalGetGuildByGuildId(guildId)
if guild == nil {
cb(0, "")
return
}
nowTime := f5.GetApp().GetNowSeconds()
if guild.joinCondType == constant.JoinCondFree &&
!guild.isFull() {
m := newMember()
m.init(guild, constant.GuildMemberLevelDefault, accountId, int32(nowTime))
guild.addMember(m)
this.addGuildMember(m)
model.GuildApply.SetStatus(guild.guildId, accountId, constant.GUILD_APPLY_STATUS_ACCEPT,
func (err error, lastInsertId int64, rowsAffected int64) {
GetDbLogMgr().GuildAccpetApply(guild.guildId, accountId, accountId)
cb(0, "")
return
})
} else {
model.GuildApply.Force(
guildId,