perf: 减少统计页面资料读取并优化区服选项查询

This commit is contained in:
Yvan
2026-11-04 16:42:11 +08:00
parent 503f3b1a7d
commit 2efce4d821
8 changed files with 184 additions and 13 deletions
+30 -4
View File
@@ -69,6 +69,7 @@ type AnalyticsPage struct {
}
type AnalyticsRepo interface {
Aggregate(context.Context, AnalyticsKind, AnalyticsScope, AnalyticsFilter) (*AnalyticsData, error)
FillNames(context.Context, AnalyticsKind, AnalyticsScope, AnalyticsFilter, []*AnalyticsRow) error
}
type AnalyticsUsecase struct {
repo AnalyticsRepo
@@ -138,7 +139,8 @@ func (uc *AnalyticsUsecase) List(ctx context.Context, kind AnalyticsKind, filter
filter.Begin = filter.StartDate.Format("2006-01-02")
filter.End = filter.EndDate.Format("2006-01-02")
out := &AnalyticsPage{Rows: []*AnalyticsRow{}, Begin: filter.Begin, End: filter.End, Available: true}
data, err := uc.repo.Aggregate(ctx, kind, AnalyticsScope{Viewer: viewer, IncludeSub: pref.IncludeSubPromote, IDCardDedup: pref.IDCardDedup}, filter)
scope := AnalyticsScope{Viewer: viewer, IncludeSub: pref.IncludeSubPromote, IDCardDedup: pref.IDCardDedup}
data, err := uc.repo.Aggregate(ctx, kind, scope, filter)
if err != nil {
return nil, err
}
@@ -165,9 +167,6 @@ func (uc *AnalyticsUsecase) List(ctx context.Context, kind AnalyticsKind, filter
pay.Add(pay, rounded)
}
counts = analyticsAdd(counts, row.Counts)
if kind == ChannelAnalytics {
row.Name = (&LedgerNames{PromoteID: &row.ID, PromoteAccount: row.Name}).DisplayPromote()
}
}
if kind == ChannelAnalytics {
counts = analyticsCap(counts)
@@ -187,6 +186,28 @@ func (uc *AnalyticsUsecase) List(ctx context.Context, kind AnalyticsKind, filter
if err := analyticsValues(out.Summary); err != nil {
return nil, err
}
// 仅按渠道名称或类型排序时需要提前读取全部资料;数字指标排序
// 确定当前页后再补名称和商务信息,汇总仍使用全部可见统计行。
namesBeforeSort := kind == ChannelAnalytics && (filter.SortField == "promoteName" || filter.SortField == "promoteType")
fillNames := func(rows []*AnalyticsRow) error {
if len(rows) == 0 {
return nil
}
if err := uc.repo.FillNames(ctx, kind, scope, filter, rows); err != nil {
return err
}
if kind == ChannelAnalytics {
for _, row := range rows {
row.Name = (&LedgerNames{PromoteID: &row.ID, PromoteAccount: row.Name}).DisplayPromote()
}
}
return nil
}
if namesBeforeSort {
if err := fillNames(data.Rows); err != nil {
return nil, err
}
}
if err := sortAnalytics(data.Rows, kind, filter.SortField, filter.Ascending); err != nil {
return nil, err
}
@@ -205,6 +226,11 @@ func (uc *AnalyticsUsecase) List(ctx context.Context, kind AnalyticsKind, filter
if from < len(data.Rows) {
out.Rows = data.Rows[from:to]
}
if !namesBeforeSort {
if err := fillNames(out.Rows); err != nil {
return nil, err
}
}
return out, nil
}
func sortAnalytics(rows []*AnalyticsRow, kind AnalyticsKind, field string, ascending bool) error {