diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go index e0c53385..8c888d7d 100644 --- a/server/imserver_new/guild/guildmgr.go +++ b/server/imserver_new/guild/guildmgr.go @@ -355,7 +355,9 @@ func (this *guildMgr) asyncAcceptApplyTask(task *f5.LockAsyncTask, guild *guild, cb(1, "") return } - nowTime := q5.ToInt32(f5.GetApp().GetNowSeconds()) + nowTime := f5.GetApp().GetNowSeconds() + model.GuildMember.Force(targetId, guild.guildId, constant.GuildMemberLevelDefault, nowTime, + /* f5.GetJsStyleDb().Upsert( constant.FRIEND_DB, "t_guild_member", @@ -376,7 +378,7 @@ func (this *guildMgr) asyncAcceptApplyTask(task *f5.LockAsyncTask, guild *guild, {"join_time", q5.ToString(nowTime)}, {"createtime", q5.ToString(nowTime)}, {"modifytime", q5.ToString(nowTime)}, - }, + },*/ func (err error, lastInsertId int64, rowsAffected int64) { if err != nil { task.SetFail() @@ -384,7 +386,7 @@ func (this *guildMgr) asyncAcceptApplyTask(task *f5.LockAsyncTask, guild *guild, return } m := newMember() - m.init(guild, constant.GuildMemberLevelDefault, targetId, nowTime) + m.init(guild, constant.GuildMemberLevelDefault, targetId, int32(nowTime)) guild.addMember(m) this.memberIdHash[targetId] = m this.asyncSetApplyStatus( diff --git a/server/imserver_new/model/guild_member.go b/server/imserver_new/model/guild_member.go index 89a38dee..c95fe80c 100644 --- a/server/imserver_new/model/guild_member.go +++ b/server/imserver_new/model/guild_member.go @@ -29,6 +29,7 @@ func (this *guildMember) Force(memberId string, guildId string, guildJob int32, [][]string{ {"guild_id", guildId}, {"guild_job", q5.ToString(guildJob)}, + {"deleted", q5.ToString(0)}, {"member_id", memberId}, {"join_time", q5.ToString(nowTime)}, {"createtime", q5.ToString(nowTime)},