by Robin at 20240329

app/mix/controller/moment_api.go

@@ -14,13 +14,12 @@ import (
 
 func ApiCreateMoment(ctx *gin.Context) {
 	req := ctx.MustGet("client_req").(*momentproto.ApiCreateReq)
-	// ec, acctPunEndTime := service.DefaultService.ApiCreateMoment(ctx, req)
-	// if ec == errcode.ErrCodMomentBlockedFromCreatingMoment {
-	// 	logger.Error("ApiCreateMoment fail, req: %v, ec: %v", util.ToJson(req), ec)
-	// 	ReplyErrCodeMsgAndDetail(ctx, ec, acctPunEndTime)
-	// 	return
-	// }
-	ec := errcode.ErrCodeSuspend
+	ec, acctPunEndTime := service.DefaultService.ApiCreateMoment(ctx, req)
+	if ec == errcode.ErrCodMomentBlockedFromCreatingMoment {
+		logger.Error("ApiCreateMoment fail, req: %v, ec: %v", util.ToJson(req), ec)
+		ReplyErrCodeMsgAndDetail(ctx, ec, acctPunEndTime)
+		return
+	}
 	if ec != errcode.ErrCodeMomentSrvOk {
 		logger.Error("ApiCreateMoment fail, req: %v, ec: %v", util.ToJson(req), ec)
 		ReplyErrCodeMsg(ctx, ec)

app/mix/dao/mongo.go

@@ -3268,22 +3268,13 @@ func (m *Mongo) GetMomentAuditTaskListWaitingForManuallyReview(ctx *gin.Context,
 	list := make([]*dbstruct.MomentAuditTask, 0)
 	col := m.getColMomentAuditTask()
 	query := qmgo.M{
-		"batch_id": batchId,
-		"del_flag": 0,
-	}
-	// 组装查询条件，查询状态均为机审通过，或其中有一个为机审失败的审核任务
-	passedFilter := qmgo.M{
-		"image_audit_task_status": consts.MomentAudit_Passed,
-		"text_audit_task_status":  consts.MomentAudit_Passed,
-	}
-	svcFailedFilter := qmgo.M{
-		"$or": []qmgo.M{
-			{"image_audit_task_status": consts.MomentAudit_ServiceFailed},
-			{"text_audit_task_status": consts.MomentAudit_ServiceFailed},
+		"image_audit_task_status": qmgo.M{
+			"$ne": consts.ImageAudit_Created,
 		},
-	}
-	query["$or"] = []qmgo.M{
-		passedFilter, svcFailedFilter,
+		"text_audit_task_status": qmgo.M{
+			"$ne": consts.TextAudit_Created,
+		},
+		"del_flag": 0,
 	}
 	err := col.Find(ctx, query).All(&list)
 	if err == qmgo.ErrNoSuchDocuments {

app/mix/service/service.go

@@ -1342,11 +1342,13 @@ func (s *Service) OpReviewMoment(ctx *gin.Context, req *momentproto.OpReviewReq)
 			return
 		}
 		go func() {
-			err := redis.GetRedisClient().RPush(consts.RedisMomentPrefix+"recent_list", momentIds)
+			for _, id := range momentIds {
+				err := redis.GetRedisClient().RPush(consts.RedisMomentPrefix+"recent_list", id)
 				if err != nil {
 					logger.Error("Push newly-created moment to list failed : %v", err)
 					return
 				}
+			}
 		}()
 	}()
 
@@ -1384,6 +1386,7 @@ func (s *Service) OpReviewMoment(ctx *gin.Context, req *momentproto.OpReviewReq)
 	// 更新动态审核表的状态
 	err = _DefaultMomentAuditTask.OpUpdateByMomentIdsAndStatus(ctx, &dbstruct.MomentAuditTask{
 		Status:                 goproto.Int64(finalMomentAuditTaskStatus),
+		ManuallyReviewOperator: goproto.Int64(req.BaseRequest.Mid),
 	}, req.MomentIds, consts.MomentManuallyReview_Waiting)
 	if err != nil {
 		logger.Error("_DefaultMomentAuditTask OpUpdateByMomentIdsAndStatus fail, req: %v, err: %v", util.ToJson(req), err)

app/mix/service/utilservice.go

@@ -511,7 +511,6 @@ func (s *Service) utilSyncImageAuditTaskResultByBatchId(ctx *gin.Context, batchI
 		AssociativeTableName:   goproto.String(dao.COLMoment),
 		AssociativeTableColumn: goproto.String("media_component"),
 		BatchId:                goproto.String(batchId),
-		Status:                 goproto.Int64(consts.MomentAudit_Created),
 	})
 	if err != nil {
 		logger.Error("_DefaultImageAuditTask OpList fail, err: %v", err)

dbstruct/moment_audit_task.go

@@ -13,6 +13,7 @@ type MomentAuditTask struct {
 	TextAuditTaskStatus    *int64          `json:"text_audit_task_status" bson:"text_audit_task_status"`     // 文字审核任务审核状态
 	Status                 *int64          `json:"status" bson:"status"`                                     // 是否已过期
 	ManuallyReviewStatus   *int64          `json:"manually_review_status" bson:"manually_review_status"`     // 人工复审状态
+	ManuallyReviewOperator *int64          `json:"manually_review_operator" bson:"manually_review_operator"` // 人工复审操作人
 	Remarks                *string         `json:"remarks" bson:"remarks"`                                   // 备注
 	Ct                     *int64          `json:"ct" bson:"ct"`                                             // 创建时间
 	Ut                     *int64          `json:"ut" bson:"ut"`                                             // 更新时间