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

---
 server/imserver_new/guild/guild.go    | 20 ---------------
 server/imserver_new/guild/guildmgr.go | 37 +++++----------------------
 2 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/server/imserver_new/guild/guild.go b/server/imserver_new/guild/guild.go
index a904f619..a47097ff 100644
--- a/server/imserver_new/guild/guild.go
+++ b/server/imserver_new/guild/guild.go
@@ -187,26 +187,6 @@ func (this *guild) asyncLeave(accountId string, cb func(int32, string)) {
 		})
 }
 
-func (this *guild) asyncUpdateOwner(ownerId string, cb func(int32, string)) {
-	f5.GetJsStyleDb().Update(
-		constant.FRIEND_DB,
-		"t_guild",
-		[][]string{
-			{"owner_id", ownerId},
-		},
-		[][]string{
-			{"guild_id", this.guildId},
-		},
-		func (err error, lastInsertId int64, rowsAffected int64) {
-			if err != nil {
-				cb(500, "server internal error")
-				return
-			}
-			cb(0, "")
-			return
-		})
-}
-
 func (this *guild) getOwnerId() string {
 	ownerId := ""
 	this.traverseMembers(
diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index 2b3b52f3..29efb6e5 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -486,16 +486,7 @@ func (this *guildMgr) AsyncSetGuildJob(accountId string, targetId string, guildJ
 			{constant.GUILD_MEMBER_LOCK_KEY, targetId},
 		},
 		func (task *f5.LockAsyncTask) {
-			f5.GetJsStyleDb().Update(
-				constant.FRIEND_DB,
-				"t_guild_member",
-				[][]string{
-					{"guild_job", q5.ToString(guildJob)},
-				},
-				[][]string{
-					{"member_id", member.memberId},
-					{"guild_id", guild.guildId},
-				},
+			model.GuildMember.SetJob(guild.guildId, member.memberId, guildJob,
 				func (err error, lastInsertId int64, rowsAffected int64) {
 					if err != nil {
 						task.SetFail()
@@ -503,17 +494,9 @@ func (this *guildMgr) AsyncSetGuildJob(accountId string, targetId string, guildJ
 						return
 					}
 					member.guildJob = guildJob
-					if guildJob == constant.GuildMemberLevelLeader {
-						f5.GetJsStyleDb().Update(
-							constant.FRIEND_DB,
-							"t_guild_member",
-							[][]string{
-								{"guild_job", q5.ToString(constant.GuildMemberLevelDefault)},
-							},
-							[][]string{
-								{"member_id", owner.memberId},
-								{"guild_id", guild.guildId},
-							},
+					if member.guildJob == constant.GuildMemberLevelLeader {
+						model.GuildMember.SetJob(guild.guildId, owner.memberId,
+							constant.GuildMemberLevelDefault,
 							func (err error, lastInsertId int64, rowsAffected int64) {
 								if err != nil {
 									task.SetFail()
@@ -521,16 +504,8 @@ func (this *guildMgr) AsyncSetGuildJob(accountId string, targetId string, guildJ
 									return
 								}
 								owner.guildJob = constant.GuildMemberLevelDefault
-								guild.asyncUpdateOwner(member.memberId,
-									func (errCode int32, errMsg string) {
-										if err != nil {
-											task.SetFail()
-											cb(500, "")
-											return
-										}
-										task.SetSucc()
-										cb(0, "")
-									})
+								task.SetSucc()
+								cb(0, "")
 							})
 					} else {
 						task.SetSucc()