This commit is contained in:
aozhiwei 2020-09-25 14:20:54 +08:00
parent f3c59b8a94
commit c349359692

View File

@ -178,20 +178,18 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
forward_msg->context(), forward_msg->context(),
respmsg); respmsg);
if (respmsg.errcode() == 0 &&
!GetMember(forward_msg->context().user_info().base_data().account_id())) {
GuildMember* member = new GuildMember();
TypeConvert::Convert(forward_msg->context().user_info().base_data(), *member);
AddMember(member);
DBHelper::Instance()->SetGuildApplyStatus GuildMember* member = new GuildMember();
( TypeConvert::Convert(forward_msg->context().user_info().base_data(), *member);
msg.apply().base_data().account_id(), AddMember(member);
guild_id,
1 DBHelper::Instance()->SetGuildApplyStatus
); (
ClearApplyBySenderId(msg.apply().base_data().account_id()); msg.apply().base_data().account_id(),
} guild_id,
1
);
ClearApplyBySenderId(msg.apply().base_data().account_id());
} }
void Guild::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg) void Guild::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)