Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test

api/errcode/errcode.go

@@ -162,6 +162,7 @@ var ErrCodeMsgMap = map[ErrCode]string{
 	ErrCodeTextAuditTaskSrvFail:          "文字审核任务服务错误",
 	ErrCodeTextAuditTaskNotExist:         "文字审核任务不存在",
 	ErrCodeTextAuditTaskManuallyPassFail: "文字审核人工通过失败",
+	ErrCodeTextAuditTaskNikeNameWait:     "昵称审核中，请耐心等待",
 
 	ErrCodeContactCustomerServiceSessionSrvFail:  "联系客服对话表服务错误",
 	ErrCodeContactCustomerServiceSessionNotExist: "联系客服对话表不存在",
@@ -497,6 +498,7 @@ const (
 	ErrCodeTextAuditTaskSrvFail          ErrCode = -23001 // 文字审核任务服务错误
 	ErrCodeTextAuditTaskNotExist         ErrCode = -23002 // 文字审核任务不存在
 	ErrCodeTextAuditTaskManuallyPassFail ErrCode = -23003 // 文字审核人工通过失败
+	ErrCodeTextAuditTaskNikeNameWait     ErrCode = -23004 // 文字审核，人工审核昵称等待
 
 	// ContactCustomerServiceSession: 24xxx
 	ErrCodeContactCustomerServiceSessionSrvOk    ErrCode = ErrCodeOk

app/mix/service/apiservice.go

@@ -380,6 +380,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{

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),

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),