补偿数据逻辑调整

This commit is contained in:
2026-04-09 09:48:22 +08:00
parent 5d72dd3aff
commit 556ec5075e
3 changed files with 99 additions and 7 deletions

View File

@@ -59,8 +59,19 @@ func (s *SyncService) SyncAccountReport(ctx context.Context, req *AccountReportR
var responseData *AccountReportResponse
if useMock {
logrus.Info("使用 Mock 数据同步快手广告账户报表")
logrus.Infof("使用 Mock 数据同步快手广告账户报表 - page=%d, pageSize=%d",
req.PageInfo.CurrentPage, req.PageInfo.PageSize)
responseData = s.mockGen.GenerateAccountReportResponseWithPage(req.PageInfo.CurrentPage, req.PageInfo.PageSize)
logrus.Infof("✓ Mock 数据生成完成 - TotalCount=%d, Detail数组长度=%d",
responseData.Data.TotalCount, len(responseData.Data.Detail))
if len(responseData.Data.Detail) > 0 {
firstItem := responseData.Data.Detail[0]
lastItem := responseData.Data.Detail[len(responseData.Data.Detail)-1]
logrus.Infof(" 第一条: campaignId=%v, creativeId=%v", firstItem.CampaignId, firstItem.CreativeId)
logrus.Infof(" 最后一条: campaignId=%v, creativeId=%v", lastItem.CampaignId, lastItem.CreativeId)
}
} else {
logrus.Info("从真实 API 同步快手广告账户报表")
respBytes, err := s.httpClient.Post(ctx, "/rest/openapi/gw/esp/report/accountReport", req)
@@ -96,6 +107,9 @@ func (s *SyncService) SyncAccountReport(ctx context.Context, req *AccountReportR
if len(responseData.Data.Detail) > 0 {
detailItems := s.converter.ConvertToDetailItems(responseData.Data.Detail, "account_report", req.PageInfo.CurrentPage)
logrus.Infof("▶ 准备插入 %d 条明细数据page=%d", len(detailItems), req.PageInfo.CurrentPage)
detailResult, saveErr := s.saveDetailData(ctx, detailItems)
if saveErr != nil {
logrus.Errorf("保存明细数据失败:%v", saveErr)
@@ -105,7 +119,7 @@ func (s *SyncService) SyncAccountReport(ctx context.Context, req *AccountReportR
result.DetailCount = len(detailItems)
result.DetailSuccessCount = detailResult.SuccessCount
result.DetailFailCount = detailResult.FailCount
logrus.Infof("成功保存 %d 条明细数据(成功=%d, 失败=%d", len(detailItems), detailResult.SuccessCount, detailResult.FailCount)
logrus.Infof("成功保存 %d 条明细数据(成功=%d, 失败=%d", len(detailItems), detailResult.SuccessCount, detailResult.FailCount)
}
}
@@ -202,7 +216,7 @@ func (s *SyncService) SyncAccountReportWithPagination(ctx context.Context, req *
RetryCount: 0,
}
result, pageLogID, err := s.syncSinglePageWithTask(ctx, req, useMock, maxRetries, pageTaskID, currentPage)
result, pageLogID, err := s.SyncSinglePageWithTask(ctx, req, useMock, maxRetries, pageTaskID, currentPage)
pageDuration := time.Since(pageStartTime).Milliseconds()
pageResult.DurationMs = pageDuration
pageResult.PageTaskLogID = pageLogID
@@ -311,7 +325,7 @@ func (s *SyncService) SyncAccountReportWithPagination(ctx context.Context, req *
return aggregatedResult, aggregatedResult.Error
}
func (s *SyncService) syncSinglePageWithTask(ctx context.Context, req *AccountReportRequest, useMock bool, maxRetries int, pageTaskID string, pageNumber int) (*SyncResult, int64, error) {
func (s *SyncService) SyncSinglePageWithTask(ctx context.Context, req *AccountReportRequest, useMock bool, maxRetries int, pageTaskID string, pageNumber int) (*SyncResult, int64, error) {
pageStartTime := time.Now()
pageLogReq := &taskDto.CreateSyncTaskLogReq{