From acc71ccd8783bb40d3b35323e55e7d76e4271faa Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 28 Sep 2020 09:39:36 +0800
Subject: [PATCH] 1

---
 server/imserver/dbhelper.cc     |  9 ++++-----
 server/imserver/guild.cc        | 16 ++++++++++++++++
 server/imserver/guild.h         |  1 +
 server/rankserver/guildmgr.cc   |  5 +++++
 server/rankserver/guildmgr.h    |  1 +
 server/rankserver/handlermgr.cc |  5 +++++
 6 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/server/imserver/dbhelper.cc b/server/imserver/dbhelper.cc
index 8d75388..515b425 100644
--- a/server/imserver/dbhelper.cc
+++ b/server/imserver/dbhelper.cc
@@ -133,7 +133,8 @@ void DBHelper::ConfirmGuild(Player* hum, long long guild_id)
                      .SetSender(hum->AccountId()),
                      [] (a8::XParams& param, const f8::DataSet* data_set)
                      {
-                         Player* hum = PlayerMgr::Instance()->GetPlayerByAccountId(param.sender.GetString());
+                         Player* hum = PlayerMgr::Instance()->GetPlayerByAccountId
+                             (param.sender.GetString());
                          if (hum) {
                              cs::SMGuildCreate respmsg;
                              hum->SendMsg(respmsg);
@@ -173,9 +174,7 @@ void DBHelper::ConfirmGuild(Player* hum, long long guild_id)
         };
 
     std::string guild_data;
-    {
-
-    }
+    Guild::GenGuildData(hum, guild_id, guild_data);
     a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(guild_id);
     DBEngine::Instance()->ExecAsyncScript
         (
@@ -183,7 +182,7 @@ void DBHelper::ConfirmGuild(Player* hum, long long guild_id)
          "UPDATE `guild` SET status=%d, guild_data='%s', modifytime=%d WHERE guild_id=%d;",
          {
              kGuildCreated,
-             "",
+             guild_data,
              App::Instance()->nowtime,
              guild_id
          },
diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index c81dfe7..592c570 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -11,6 +11,7 @@
 #include "utils.h"
 #include "dbhelper.h"
 #include "synchelper.h"
+#include "player.h"
 
 const int GUILD_MAX_MEMBER_NUM = 50;
 
@@ -686,3 +687,18 @@ void Guild::SendErrorMsg(int socket_handle, const ss::MFIMMsgConext& context, co
                                             context,
                                             notifymsg);
 }
+
+void Guild::GenGuildData(Player* hum, long long guild_id, std::string& guild_data)
+{
+    ss::MFGuildDB guild_db;
+    {
+        auto member = guild_db.add_members();
+        cs::MFUserInfo user_info;
+        hum->FillMFUserInfo(&user_info);
+        BaseUserData base_data;
+        TypeConvert::Convert(user_info.base_data(), base_data);
+        TypeConvert::Convert(base_data, *member->mutable_base_data());
+        member->mutable_base_data()->set_guild_job(kGuildOwner);
+    }
+    guild_db.SerializeToString(&guild_data);
+}
diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index 277c987..304aa92 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -101,4 +101,5 @@ public:
                               int guild_status,
                               int createtime
                               );
+    static void GenGuildData(Player* hum, long long guild_id, std::string& guild_data);
 };
diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index 3de14e8..a09c96b 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -190,6 +190,11 @@ void GuildMgr::__GuildRank(f8::JsonHttpRequest* request)
     delete guild_list;
 }
 
+void GuildMgr::__GuildConfirmed(f8::JsonHttpRequest* request)
+{
+
+}
+
 void GuildMgr::__GenTestData(f8::JsonHttpRequest* request)
 {
     if (!load_done_) {
diff --git a/server/rankserver/guildmgr.h b/server/rankserver/guildmgr.h
index cc8000e..5612aa2 100644
--- a/server/rankserver/guildmgr.h
+++ b/server/rankserver/guildmgr.h
@@ -18,6 +18,7 @@ class GuildMgr : public a8::Singleton<GuildMgr>
     void __GuildCreate(f8::JsonHttpRequest* request);
     void __GuildSearch(f8::JsonHttpRequest* request);
     void __GuildRank(f8::JsonHttpRequest* request);
+    void __GuildConfirmed(f8::JsonHttpRequest* request);
     void __GenTestData(f8::JsonHttpRequest* request);
 
  private:
diff --git a/server/rankserver/handlermgr.cc b/server/rankserver/handlermgr.cc
index 6e38f02..7aa4b48 100644
--- a/server/rankserver/handlermgr.cc
+++ b/server/rankserver/handlermgr.cc
@@ -45,6 +45,11 @@ void HandlerMgr::Init()
                          {
                              GuildMgr::Instance()->__GuildRank(request);
                          });
+    RegisterGMMsgHandler("Guild@confirmed",
+                         [] (f8::JsonHttpRequest* request)
+                         {
+                             GuildMgr::Instance()->__GuildConfirmed(request);
+                         });
     RegisterGMMsgHandler("Guild@genTestData",
                          [] (f8::JsonHttpRequest* request)
                          {