server/relation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-11-20 15:58:54 +08:00
parent 592136e90f
commit 1ef4b857bb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/rankserver/guildmgr.cc
View File

@ -166,11 +166,13 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
delete guild; delete guild;
return; return;
} }
long long name_ext1 = GetNameExt1(guild->_channel());
long long name_ext2 = 0;
if (GetGuildByName( if (GetGuildByName(
guild->_gameid(), guild->_gameid(),
guild->_channel(), guild->_channel(),
guild->_name_ext1(), name_ext1,
guild->_name_ext2(), name_ext2,
guild->guild_name() guild->guild_name()
)) { )) {
request->resp_xobj->SetVal("errcode", 3); request->resp_xobj->SetVal("errcode", 3);
@ -210,11 +212,6 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
guild->set_member_num(1); guild->set_member_num(1);
guild->set__createtime(App::Instance()->nowtime); guild->set__createtime(App::Instance()->nowtime);
guild->set__modifytime(App::Instance()->nowtime); guild->set__modifytime(App::Instance()->nowtime);
long long name_ext1 = GetNameExt1(guild->_channel());
long long name_ext2 = 0;
if (f8::Channel_e::DOUYIN == guild->_channel()) {
name_ext1 = f8::Channel_e::DOUYIN;
}
std::string guild_name_base64; std::string guild_name_base64;
a8::openssl::Base64Encode(guild->guild_name(), guild_name_base64); a8::openssl::Base64Encode(guild->guild_name(), guild_name_base64);
DBEngine::Instance()->ExecAsyncScript DBEngine::Instance()->ExecAsyncScript
@ -937,6 +934,7 @@ void GuildMgr::InternalSearch(const std::string& account_id,
total_page = 0; total_page = 0;
total_count = 0; total_count = 0;
int gameid = f8::ExtractGameIdFromAccountId(account_id); int gameid = f8::ExtractGameIdFromAccountId(account_id);
int channel = f8::ExtractChannelIdFromAccountId(account_id);
a8::CommonRank<cs::MFGuildBasic>* commonrank = GetGuildList(gameid); a8::CommonRank<cs::MFGuildBasic>* commonrank = GetGuildList(gameid);
if (!commonrank || commonrank->GetList().empty()) { if (!commonrank || commonrank->GetList().empty()) {
return; return;
@ -955,6 +953,9 @@ void GuildMgr::InternalSearch(const std::string& account_id,
if (guild_list->Size() >= page_size) { if (guild_list->Size() >= page_size) {
break; break;
} }
if (guild->_channel() != channel) {
continue;
}
a8::MutableXObject* guild_xobj = a8::MutableXObject::NewObject(); a8::MutableXObject* guild_xobj = a8::MutableXObject::NewObject();
TypeConvert::Convert(guild, guild_xobj); TypeConvert::Convert(guild, guild_xobj);
if (applyed_guilds.find(guild->guild_id()) != applyed_guilds.end()) { if (applyed_guilds.find(guild->guild_id()) != applyed_guilds.end()) {