diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc index b17960a..eb11780 100644 --- a/server/rankserver/guildmgr.cc +++ b/server/rankserver/guildmgr.cc @@ -103,6 +103,10 @@ void DbToGuildBasic(const std::vector& row, cs::MFGuildBasic* guild guild->set_member_num(a8::XValue(row[22])); guild->set__name_ext1(a8::XValue(row[23])); guild->set__name_ext2(a8::XValue(row[24])); + guild->set_owner_vip_lv(a8::XValue(row[25])); + guild->set_owner_head(a8::XValue(row[26])); + //guild->set_creator_vip_lv(a8::XValue(row[27])); + //guild->set_creator_head(a8::XValue(row[28])); } /* @@ -117,7 +121,7 @@ static std::string GenSelectGuildSql(const std::string& where) " guild_declaration, owner_id, owner_name, owner_avatar_url, " " creator_id, creator_name, creator_avatar_url, guild_status, " " join_unlimited, join_cond1, join_cond2, createtime, modifytime, channel, guild_member_num, " - " name_ext1, name_ext2 " + " name_ext1, name_ext2, owner_vip_lv, owner_head, creator_vip_lv, creator_head " "FROM `guild` "; sql += where; return sql; @@ -370,6 +374,8 @@ void GuildMgr::__GuildUpdate(f8::JsonHttpRequest* request) guild->set_owner_id(request->request.At("owner_id")->AsXValue()); guild->set_owner_name(request->request.At("owner_name")->AsXValue().GetString()); guild->set_owner_avatar_url(request->request.At("owner_avatar_url")->AsXValue().GetString()); + guild->set_owner_vip_lv(request->request.At("owner_vip_lv")->AsXValue()); + guild->set_owner_head(request->request.At("owner_head")->AsXValue()); guild->set_join_unlimited(request->request.At("join_unlimited")->AsXValue()); guild->set_join_cond1(request->request.At("join_cond1")->AsXValue()); guild->set_join_cond2(request->request.At("join_cond2")->AsXValue()); diff --git a/server/rankserver/typeconvert.cc b/server/rankserver/typeconvert.cc index 519e438..a9823cc 100644 --- a/server/rankserver/typeconvert.cc +++ b/server/rankserver/typeconvert.cc @@ -16,6 +16,8 @@ void TypeConvert::Convert(const cs::MFGuildBasic* guild_basic, a8::MutableXObjec xobj->SetVal("owner_id", guild_basic->owner_id()); xobj->SetVal("owner_name", guild_basic->owner_name()); xobj->SetVal("owner_avatar_url", guild_basic->owner_avatar_url()); + xobj->SetVal("owner_vip_lv", guild_basic->owner_vip_lv()); + xobj->SetVal("owner_head", guild_basic->owner_head()); xobj->SetVal("join_unlimited", guild_basic->join_unlimited()); xobj->SetVal("join_cond1", guild_basic->join_cond1()); xobj->SetVal("join_cond2", guild_basic->join_cond2());