fiee/fonchain-fiee
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-zjy-fixbug-022' into dev

Browse Source
This commit is contained in:
周俊耀 2026-01-04 11:08:32 +08:00
commit 5b6e72ee96
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cron/task.go
View File

@ -34,7 +34,8 @@ func InitTasks() error {
err = cm.AddTask("scheduledPublish", "0 */1 * * * *", ScheduledPublishTask)
// 每天 00:30 和 12:30 执行 Ayrshare 指标采集任务
err = cm.AddTask("ayrshareMetricsCollector", "0 30 0,12 * * *", AyrshareMetricsCollectorTask)
// err = cm.AddTask("ayrshareMetricsCollector", "0 30 0,12 * * *", AyrshareMetricsCollectorTask)
err = cm.AddTask("ayrshareMetricsCollector", "0 30 0 * * *", AyrshareMetricsCollectorTask)
if err != nil {
log.Printf("添加定时任务失败: %v", err)
}

5
pkg/router/analysis.go
View File

@ -10,7 +10,7 @@ import (
)
func AnalysisRouter(r *gin.RouterGroup) {
r.POST("analysis/trigger-ayrshare-metrics", serviceCast.TriggerAyrshareMetricsCollector)
// r.POST("analysis/trigger-ayrshare-metrics", serviceCast.TriggerAyrshareMetricsCollector)
analysis := r.Group("analysis")
analysis.Use(middleware.CheckWebLogin(service.AccountProvider))
@ -31,7 +31,8 @@ func AnalysisRouter(r *gin.RouterGroup) {
analysis.POST("artist-metrics-single", serviceCast.ArtistMetricsDailyWindow) // 艺人指标日窗口
analysis.POST("tobe-confirmed-list", serviceCast.TobeConfirmedList) // 待确认数据列表
analysis.POST("update-approval-id", serviceCast.UpdateWorkAnalysisApprovalID) // 更新作品分析审批ID
// analysis.POST("trigger-ayrshare-metrics", serviceCast.TriggerAyrshareMetricsCollector) // 手动触发 Ayrshare 指标采集任务
analysis.POST("trigger-ayrshare-metrics", serviceCast.TriggerAyrshareMetricsCollector) // 手动触发 Ayrshare 指标采集任务
}

2
pkg/service/bundle/reconciliation.go
View File

@ -275,6 +275,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
var TotalPrice float32
var expirationDay string
numMap := make(map[string]int32)
numMap["1500.00"] = 0
numMap["3150.00"] = 3
numMap["4200.00"] = 5
numMap["5600.00"] = 8
@ -287,6 +288,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
numMap["18300.00"] = 40
numMap["26700.00"] = 60
incrMap := make(map[string]float32)
incrMap["1500.00"] = 0
incrMap["3150.00"] = 1650
incrMap["4200.00"] = 2700
incrMap["5600.00"] = 4100

3
pkg/service/cast/analysis.go
View File

@ -780,8 +780,9 @@ func executeAyrshareMetricsCollector() {
zap.L().Info("Ayrshare 指标采集任务执行完成")
fmt.Printf("[%s] [INFO] Ayrshare 指标采集任务执行完成\n", time.Now().Format("2006-01-02 15:04:05"))
// 暂停重试
// 第三步：重试失败的记录（使用并发处理）
retryFailedMetricsForAyrshareConcurrent(ctx, dateCN)
// retryFailedMetricsForAyrshareConcurrent(ctx, dateCN)
// 第四步：根据作品数据计算并更新账号日级指标
zap.L().Info("开始计算账号日级指标")

3
pkg/service/cast/work.go
View File

@ -520,7 +520,8 @@ func PostAS(workUuid string) error {
needPlatformIDs := workDetail.NeedPlatformIDs
if len(needPlatformIDs) == 0 {
zap.L().Error("Publish WorkDetail failed 作品无发布平台", zap.String("workUuid", workUuid))
return errors.New("作品无发布平台")
return nil
//return errors.New("作品无发布平台")
}
zap.L().Info("post 2", zap.Any("workUuid", workUuid))
var mediaUrls []string