feat: 完善小组绩效与有效端统计并修复审查问题

This commit is contained in:
Yvan
2026-11-05 01:10:03 +08:00
parent ca9ce99b66
commit dc97690eb1
75 changed files with 5033 additions and 296 deletions
+24 -15
View File
@@ -55,31 +55,34 @@ func (r *AnalyticsRow) BusinessName() string {
}
type AnalyticsData struct {
Rows []*AnalyticsRow
GlobalCounts *PortraitCounts
GlobalPay string
Available bool
EffectiveCount int64
Rows []*AnalyticsRow
GlobalCounts *PortraitCounts
GlobalPay string
Available bool
}
type AnalyticsPage struct {
Rows []*AnalyticsRow
Total int64
Summary *AnalyticsRow
Begin, End string
Available bool
EffectiveCount int64
Rows []*AnalyticsRow
Total int64
Summary *AnalyticsRow
Begin, End string
Available bool
}
type AnalyticsRepo interface {
Aggregate(context.Context, AnalyticsKind, AnalyticsScope, AnalyticsFilter) (*AnalyticsData, error)
FillNames(context.Context, AnalyticsKind, AnalyticsScope, AnalyticsFilter, []*AnalyticsRow) error
}
type AnalyticsUsecase struct {
repo AnalyticsRepo
accounts *AccountUsecase
preferences *UserPreferenceUsecase
now func() time.Time
repo AnalyticsRepo
accounts *AccountUsecase
preferences *UserPreferenceUsecase
now func() time.Time
effectiveness *EffectivenessUsecase
}
func NewAnalyticsUsecase(repo AnalyticsRepo, accounts *AccountUsecase, preferences *UserPreferenceUsecase) *AnalyticsUsecase {
return &AnalyticsUsecase{repo: repo, accounts: accounts, preferences: preferences, now: time.Now}
func NewAnalyticsUsecase(repo AnalyticsRepo, accounts *AccountUsecase, preferences *UserPreferenceUsecase, effectiveness *EffectivenessUsecase) *AnalyticsUsecase {
return &AnalyticsUsecase{repo: repo, accounts: accounts, preferences: preferences, now: time.Now, effectiveness: effectiveness}
}
func analyticsCap(c PortraitCounts) PortraitCounts {
return PortraitCounts{Register: min(c.Register, 2147483647), Active: min(c.Active, 2147483647), Pay: min(c.Pay, 2147483647), NewPay: min(c.NewPay, 2147483647)}
@@ -140,6 +143,11 @@ func (uc *AnalyticsUsecase) List(ctx context.Context, kind AnalyticsKind, filter
filter.End = filter.EndDate.Format("2006-01-02")
out := &AnalyticsPage{Rows: []*AnalyticsRow{}, Begin: filter.Begin, End: filter.End, Available: true}
scope := AnalyticsScope{Viewer: viewer, IncludeSub: pref.IncludeSubPromote, IDCardDedup: pref.IDCardDedup}
if kind == ChannelAnalytics && uc.effectiveness != nil {
if err := uc.effectiveness.Ensure(ctx); err != nil {
return nil, err
}
}
data, err := uc.repo.Aggregate(ctx, kind, scope, filter)
if err != nil {
return nil, err
@@ -148,6 +156,7 @@ func (uc *AnalyticsUsecase) List(ctx context.Context, kind AnalyticsKind, filter
out.Available = false
return out, nil
}
out.EffectiveCount = data.EffectiveCount
counts := PortraitCounts{}
pay := new(big.Rat)
for _, row := range data.Rows {