diff --git a/pkg/service/cast/analysis.go b/pkg/service/cast/analysis.go index 52b2f276..23630d9c 100644 --- a/pkg/service/cast/analysis.go +++ b/pkg/service/cast/analysis.go @@ -867,31 +867,11 @@ func ArtistMetricsSeries(ctx *gin.Context) { subNum = infoResp.SubNum } - var subInfoResp *accountFiee.UserInfoResponse - var subInfoErr error - var workStatsResp *cast.GetArtistWorkStatsResp - var metricsResp *cast.ArtistMetricsSeriesResp - var workStatsErr, metricsErr error - - wg := sync.WaitGroup{} - wg.Add(2) - - // 并行调用 SubNumGetInfo、ArtistMetricsSeries - go func() { - defer wg.Done() - subInfoResp, subInfoErr = service.AccountFieeProvider.SubNumGetInfo(context.Background(), &accountFiee.SubNumGetInfoRequest{ - SubNum: subNum, - Domain: "app", - }) - }() - - go func() { - defer wg.Done() - metricsResp, metricsErr = service.CastProvider.ArtistMetricsSeries(context.Background(), req) - }() - - wg.Wait() - + // 先串行获取艺人信息,以便用正确的 artistUUID 调用后续接口 + subInfoResp, subInfoErr := service.AccountFieeProvider.SubNumGetInfo(context.Background(), &accountFiee.SubNumGetInfoRequest{ + SubNum: subNum, + Domain: "app", + }) if subInfoErr != nil { service.Error(ctx, errors.New("自媒体用户查询失败")) return @@ -902,6 +882,9 @@ func ArtistMetricsSeries(ctx *gin.Context) { } req.ArtistUUID = fmt.Sprint(subInfoResp.Id) + // 使用正确的 artistUUID 调用 ArtistMetricsSeries + metricsResp, metricsErr := service.CastProvider.ArtistMetricsSeries(context.Background(), req) + // 将 ArtistMetricsSeriesReq 中 int 类型日期(YYYYMMDD)格式化为时间字符串,作为快照截止时间 statusUpdateTime := "" if req.Date > 0 { @@ -912,7 +895,7 @@ func ArtistMetricsSeries(ctx *gin.Context) { } newCtx := NewCtxWithUserInfo(ctx) - workStatsResp, workStatsErr = service.CastProvider.GetArtistWorkStats(newCtx, &cast.GetArtistWorkStatsReq{ + workStatsResp, workStatsErr := service.CastProvider.GetArtistWorkStats(newCtx, &cast.GetArtistWorkStatsReq{ ArtistUuid: req.ArtistUUID, StatusUpdateTime: statusUpdateTime, })