From a6a7fed77044b2a4539453428042c4a3b45d1b6a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 11 Apr 2024 17:19:59 +0800
Subject: [PATCH] 1

---
 server/imserver_new/guild/guildmgr.go    | 25 +++-------------
 server/imserver_new/model/guild_apply.go | 38 ++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 server/imserver_new/model/guild_apply.go

diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index 62ee6779..e0c53385 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -326,29 +326,12 @@ func (this *guildMgr) AsyncApplyJoin(accountId string, guildId string, cb func(i
 		cb(0, "")
 		return
 	}
-	nowTime := f5.GetApp().GetNowSeconds()
-	f5.GetJsStyleDb().Upsert(
-		constant.FRIEND_DB,
-		"t_guild_apply",
-		[][]string{
-			{"guild_id", guildId},
-			{"account_id", accountId},
-		},
-		[][]string{
-			{"status", q5.ToString(constant.GUILD_APPLY_STATUS_NONE)},
-			{"last_apply_time", q5.ToString(nowTime)},
-		},
-		[][]string{
-			{"guild_id", guildId},
-			{"account_id", accountId},
-			{"status", q5.ToString(constant.GUILD_APPLY_STATUS_NONE)},
-			{"last_apply_time", q5.ToString(nowTime)},
-			{"createtime", q5.ToString(nowTime)},
-			{"modifytime", q5.ToString(nowTime)},
-		},
+	model.GuildApply.Force(
+		guildId,
+		accountId,
 		func (err error, lastInsertId int64, rowsAffected int64) {
 			if err != nil {
-				cb(1, "")
+				cb(500, "server internal error")
 				return
 			}
 			cb(0, "")
diff --git a/server/imserver_new/model/guild_apply.go b/server/imserver_new/model/guild_apply.go
new file mode 100644
index 00000000..2b5e9d99
--- /dev/null
+++ b/server/imserver_new/model/guild_apply.go
@@ -0,0 +1,38 @@
+package model
+
+import (
+	"q5"
+	"f5"
+	"main/constant"
+)
+
+type guildApply struct {
+
+}
+
+var GuildApply = new (guildApply)
+
+func (this *guildApply) Force(guildId string, accountId string,
+	cb func (error, int64, int64)) {
+	nowTime := f5.GetApp().GetNowSeconds()
+	f5.GetJsStyleDb().Upsert(
+		constant.FRIEND_DB,
+		"t_guild_apply",
+		[][]string{
+			{"guild_id", guildId},
+			{"account_id", accountId},
+		},
+		[][]string{
+			{"status", q5.ToString(constant.GUILD_APPLY_STATUS_NONE)},
+			{"last_apply_time", q5.ToString(nowTime)},
+		},
+		[][]string{
+			{"guild_id", guildId},
+			{"account_id", accountId},
+			{"status", q5.ToString(constant.GUILD_APPLY_STATUS_NONE)},
+			{"last_apply_time", q5.ToString(nowTime)},
+			{"createtime", q5.ToString(nowTime)},
+			{"modifytime", q5.ToString(nowTime)},
+		},
+		cb)
+}