From 1fb5625ec031f01fe249bd681e83fe12cb7fda9e Mon Sep 17 00:00:00 2001 From: wangxinyu Date: Tue, 10 Dec 2024 15:56:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BB=E6=92=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=98=B5=E7=A7=B0=E9=80=9A=E8=BF=87=E4=BA=BA?= =?UTF-8?q?=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/errcode/errcode.go | 2 ++ app/mix/service/apiservice.go | 6 ++++++ app/mix/service/textauditservice.go | 1 + .../service/textaudittask_result_handler.go | 19 ++++++++++--------- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go index 4daf4307..00154a2f 100644 --- a/api/errcode/errcode.go +++ b/api/errcode/errcode.go @@ -158,6 +158,7 @@ var ErrCodeMsgMap = map[ErrCode]string{ ErrCodeTextAuditTaskSrvFail: "文字审核任务服务错误", ErrCodeTextAuditTaskNotExist: "文字审核任务不存在", ErrCodeTextAuditTaskManuallyPassFail: "文字审核人工通过失败", + ErrCodeTextAuditTaskNikeNameWait: "昵称审核中,请耐心等待", ErrCodeContactCustomerServiceSessionSrvFail: "联系客服对话表服务错误", ErrCodeContactCustomerServiceSessionNotExist: "联系客服对话表不存在", @@ -467,6 +468,7 @@ const ( ErrCodeTextAuditTaskSrvFail ErrCode = -23001 // 文字审核任务服务错误 ErrCodeTextAuditTaskNotExist ErrCode = -23002 // 文字审核任务不存在 ErrCodeTextAuditTaskManuallyPassFail ErrCode = -23003 // 文字审核人工通过失败 + ErrCodeTextAuditTaskNikeNameWait ErrCode = -23004 // 文字审核,人工审核昵称等待 // ContactCustomerServiceSession: 24xxx ErrCodeContactCustomerServiceSessionSrvOk ErrCode = ErrCodeOk diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index e89937b9..f827a87d 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -363,6 +363,12 @@ func (s *Service) ApiUpdateAccount(ctx *gin.Context, req *accountproto.ApiUpdate s.CreateUpdateAccountImageAudit(ctx, oldAccount, req.Account) s.CreateUpdateAccountTextAudit(ctx, oldAccount, req.Account) + // 主播昵称需要先过审核,后更新 + if oldAccount.GetRole() == consts.Streamer && oldAccount.Name != req.Name { + ec = errcode.ErrCodeTextAuditTaskNikeNameWait + return + } + // 用户只允许修改昵称和头像 if err := _DefaultAccount.OpUpdate(ctx, &accountproto.OpUpdateReq{ Account: &dbstruct.Account{ diff --git a/app/mix/service/textauditservice.go b/app/mix/service/textauditservice.go index c347f793..04e66517 100644 --- a/app/mix/service/textauditservice.go +++ b/app/mix/service/textauditservice.go @@ -22,6 +22,7 @@ func (s *Service) CreateUpdateAccountTextAudit(ctx *gin.Context, oldAccount *dbs return } + // TODO:wxy, 是否增加审核中状态 tasks = append(tasks, &dbstruct.TextAuditTask{ Mid: newAccount.Mid, RouteUrl: goproto.String(ctx.Request.URL.Path), diff --git a/app/mix/service/textaudittask_result_handler.go b/app/mix/service/textaudittask_result_handler.go index b34bc7dc..81b5f450 100644 --- a/app/mix/service/textaudittask_result_handler.go +++ b/app/mix/service/textaudittask_result_handler.go @@ -72,14 +72,22 @@ func (handler *TextAuditTaskResultHandler) generateAccountNameUpdateFunc() { } mid := task.AssociativeTableId + acct, err := _DefaultAccount.OpListByMid(ctx, &accountproto.OpListByMidReq{ + Mid: mid, + }) + if err != nil { + return err + } + + // 主播昵称需要先过审核,后更新 var name *string if option == consts.TextAuditTaskUpdate_Pass { name = task.AuditedText - } else { + } else if option != consts.TextAuditTaskUpdate_Pass && acct.GetRole() != consts.Streamer { name = task.OldText } - err := _DefaultAccount.OpUpdate(ctx, &accountproto.OpUpdateReq{ + err = _DefaultAccount.OpUpdate(ctx, &accountproto.OpUpdateReq{ Account: &dbstruct.Account{ Mid: mid, Name: name, @@ -90,13 +98,6 @@ func (handler *TextAuditTaskResultHandler) generateAccountNameUpdateFunc() { return err } - acct, err := _DefaultAccount.OpListByMid(ctx, &accountproto.OpListByMidReq{ - Mid: mid, - }) - if err != nil { - return err - } - if acct.GetRole() == consts.Streamer { return _DefaultStreamerAcct.OpUpdate(ctx, &dbstruct.EsStreamerAcct{ Mid: util.DerefInt64(mid),