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

---
 server/imserver_new/guild/guild.go        | 12 ++----------
 server/imserver_new/guild/guildmgr.go     |  2 +-
 server/imserver_new/model/guild_member.go | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/server/imserver_new/guild/guild.go b/server/imserver_new/guild/guild.go
index 62e310f9..2cc1738b 100644
--- a/server/imserver_new/guild/guild.go
+++ b/server/imserver_new/guild/guild.go
@@ -6,6 +6,7 @@ import (
 	"cs"
 	"github.com/golang/protobuf/proto"
 	"main/constant"
+	"main/model"
 	. "main/global"
 )
 
@@ -176,16 +177,7 @@ func (this *guild) asyncLeave(accountId string, cb func(int32, string)) {
 		cb(0, "")
 		return
 	}
-	f5.GetJsStyleDb().Update(
-		constant.FRIEND_DB,
-		"t_guild_member",
-		[][]string{
-			{"deleted", "1"},
-		},
-		[][]string{
-			{"guild_id", this.guildId},
-			{"member_id", m.memberId},
-		},
+	model.GuildMember.Delete(this.guildId, m.memberId,
 		func (err error, lastInsertId int64, rowsAffected int64) {
 			if err != nil {
 				cb(500, "server internal error")
diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index 173c8951..d27d0f5d 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -360,7 +360,7 @@ func (this *guildMgr) asyncAcceptApplyTask(task *f5.LockAsyncTask, guild *guild,
 		func (err error, lastInsertId int64, rowsAffected int64) {
 			if err != nil {
 				task.SetFail()
-				cb(1, "")
+				cb(500, "server internal error")
 				return
 			}
 			m := newMember()
diff --git a/server/imserver_new/model/guild_member.go b/server/imserver_new/model/guild_member.go
index c95fe80c..563f106b 100644
--- a/server/imserver_new/model/guild_member.go
+++ b/server/imserver_new/model/guild_member.go
@@ -37,3 +37,18 @@ func (this *guildMember) Force(memberId string, guildId string, guildJob int32,
 		},
 		cb)
 }
+
+func (this *guildMember) Delete(guildId string, memberId string,
+	cb func (error, int64, int64)) {
+	f5.GetJsStyleDb().Update(
+		constant.FRIEND_DB,
+		"t_guild_member",
+		[][]string{
+			{"deleted", "1"},
+		},
+		[][]string{
+			{"guild_id", guildId},
+			{"member_id", memberId},
+		},
+		cb)
+}