From 48af45b579cb2b03fe7d25ed3013cc861ca5bee8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 11 Apr 2024 20:03:06 +0800
Subject: [PATCH] 1

---
 server/imserver_new/guild/guild.go        | 6 +++---
 server/imserver_new/guild/guildmgr.go     | 4 ++--
 server/imserver_new/model/guild.go        | 2 +-
 server/imserver_new/model/guild_member.go | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/imserver_new/guild/guild.go b/server/imserver_new/guild/guild.go
index a47097ff..7235e437 100644
--- a/server/imserver_new/guild/guild.go
+++ b/server/imserver_new/guild/guild.go
@@ -104,7 +104,7 @@ func (this *guild) updateByKv(kv map[int32]string) {
 }
 
 func (this *guild) disband()  {
-	model.Guild.Delete(this.guildId,
+	model.Guild.DeleteSoft(this.guildId,
 		func (err error, lastInsertId int64, rowsAffected int64) {
 		})
 	model.GuildApply.Clear(this.guildId,
@@ -149,7 +149,7 @@ func (this *guild) asyncLeave(accountId string, cb func(int32, string)) {
 		cb(0, "")
 		return
 	}
-	model.GuildMember.Delete(this.guildId, m.memberId,
+	model.GuildMember.DeleteSoft(this.guildId, m.memberId,
 		func (err error, lastInsertId int64, rowsAffected int64) {
 			if err != nil {
 				cb(500, "server internal error")
@@ -173,7 +173,7 @@ func (this *guild) asyncLeave(accountId string, cb func(int32, string)) {
 				}
 			}
 			if this.GetMemberNum() <= 0 {
-				model.Guild.Delete(this.guildId,
+				model.Guild.DeleteSoft(this.guildId,
 					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 c802e992..77307f37 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -541,7 +541,7 @@ func (this *guildMgr) AsyncKickout(accountId string, targetId string, cb func(in
 			{constant.GUILD_MEMBER_LOCK_KEY, targetId},
 		},
 		func (task *f5.LockAsyncTask) {
-			model.GuildMember.Delete(guild.guildId, targetId,
+			model.GuildMember.DeleteSoft(guild.guildId, targetId,
 				func (err error, lastInsertId int64, rowsAffected int64) {
 					if err != nil {
 						cb(500, "server internal error")
@@ -750,7 +750,7 @@ func (this *guildMgr) clearEmptyGuild() {
 	for _, g := range(emptyGuilds) {
 		this.delGuildNoRearrangement(g)
 		GetDbLogMgr().GuildClearEmptyStart(g.guildId, g.guildName)
-		model.Guild.Delete(g.guildId,
+		model.Guild.DeleteSoft(g.guildId,
 			func (err error, lastInsertId int64, rowsAffected int64) {
 			})
 	}
diff --git a/server/imserver_new/model/guild.go b/server/imserver_new/model/guild.go
index 2deec77f..437ddfc6 100644
--- a/server/imserver_new/model/guild.go
+++ b/server/imserver_new/model/guild.go
@@ -29,7 +29,7 @@ func (this *guild) New(guildId string, guildName string, creatorId string, avata
 		cb)
 }
 
-func (this *guild) Delete(guildId string,
+func (this *guild) DeleteSoft(guildId string,
 	cb func (error, int64, int64)) {
 	f5.GetJsStyleDb().Update(
 		constant.FRIEND_DB,
diff --git a/server/imserver_new/model/guild_member.go b/server/imserver_new/model/guild_member.go
index 73d6ec19..ec8c059b 100644
--- a/server/imserver_new/model/guild_member.go
+++ b/server/imserver_new/model/guild_member.go
@@ -38,7 +38,7 @@ func (this *guildMember) Force(memberId string, guildId string, guildJob int32,
 		cb)
 }
 
-func (this *guildMember) Delete(guildId string, memberId string,
+func (this *guildMember) DeleteSoft(guildId string, memberId string,
 	cb func (error, int64, int64)) {
 	f5.GetJsStyleDb().Update(
 		constant.FRIEND_DB,