fix: align business reports and record task migration progress
This commit is contained in:
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"fmt"
|
||||
"kra/pkg/task"
|
||||
"math"
|
||||
"math/big"
|
||||
"strconv"
|
||||
@@ -98,6 +99,7 @@ func (uc *EffectivenessUsecase) rebuild(ctx context.Context, rule OtherSettings,
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
task.Logf(ctx, "有效端计算:全量=%t;注册后 %d 天内满 %d 元;待计算渠道=%d", full, rule.Days, rule.Amount, len(candidates))
|
||||
type accumulator struct {
|
||||
candidate *EffectivenessCandidate
|
||||
sum *big.Rat
|
||||
@@ -120,7 +122,9 @@ func (uc *EffectivenessUsecase) rebuild(ctx context.Context, rule OtherSettings,
|
||||
}
|
||||
values[c.ChannelKey] = a
|
||||
}
|
||||
charges := 0
|
||||
err = uc.repo.Charges(ctx, candidates, duration, now, full, func(charge EffectivenessCharge) error {
|
||||
charges++
|
||||
a := values[charge.ChannelKey]
|
||||
if a == nil {
|
||||
return nil
|
||||
@@ -144,5 +148,15 @@ func (uc *EffectivenessUsecase) rebuild(ctx context.Context, rule OtherSettings,
|
||||
a := values[c.ChannelKey]
|
||||
results = append(results, EffectivenessResult{ChannelKey: c.ChannelKey, QualifiedAt: a.at, WindowPay: portraitDecimal(a.sum, 2), Complete: a.complete})
|
||||
}
|
||||
return uc.repo.Publish(ctx, state, rule, key, results, save)
|
||||
updated, err := uc.repo.Publish(ctx, state, rule, key, results, save)
|
||||
if err == nil {
|
||||
qualified := 0
|
||||
for _, result := range results {
|
||||
if result.QualifiedAt != nil {
|
||||
qualified++
|
||||
}
|
||||
}
|
||||
task.Logf(ctx, "有效端结果已提交;扫描流水=%d;更新渠道=%d;本批达标渠道=%d", charges, len(results), qualified)
|
||||
}
|
||||
return updated, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user