Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev

pkg/service/bundle/bundleBalance.go

@@ -314,6 +314,15 @@ func WorkAnalysisConfirm(c *gin.Context) { // 确认数据分析并扣除余量
 		service.Error(c, errors.New(common.UpdateWorkStatusFailed))
 		return
 	}
+	// 如果是艺人手动确认，确认操作后，自动标记为待阅读状态
+	_, err = service.CastProvider.UpdateWorkAnalysisStatus(c, &cast.UpdateWorkAnalysisStatusReq{
+		WorkAction: cast.WorkActionENUM_READ,
+		Uuid:       req.Uuid,
+	})
+	if err != nil {
+		service.Error(c, errors.New(common.UpdateWorkStatusFailed))
+		return
+	}
 	service.Success(c, res)
 }
 

pkg/service/cast/analysis.go

@@ -75,18 +75,6 @@ func UpdateWorkAnalysisStatus(ctx *gin.Context) {
 		service.Error(ctx, err)
 		return
 	}
-	// 如果是艺人手动确认，确认操作后，自动标记为待阅读状态
-	if req.WorkAction == cast.WorkActionENUM_CONFIRM {
-		readReq := &cast.UpdateWorkAnalysisStatusReq{
-			WorkAction: cast.WorkActionENUM_READ,
-			Uuid:       req.Uuid,
-		}
-		_, err = service.CastProvider.UpdateWorkAnalysisStatus(newCtx, readReq)
-		if err != nil {
-			service.Error(ctx, err)
-			return
-		}
-	}
 	service.Success(ctx, nil)
 	return
 }

pkg/service/cast/media.go

@@ -200,7 +200,9 @@ func OAuthAccount(ctx *gin.Context) {
 		return
 	}
 	if cast.PlatformIDENUM_DM == cast.PlatformIDENUM(resp.PlatformID) {
-		service.Success(ctx, resp)
+		service.Success(ctx, map[string]interface{}{
+			"url": resp.AuthUrl,
+		})
 		return
 	}
 	if resp.ProfileKey == "" {