fix: 完成商务迁移复核与接口优化并清理历史资料

This commit is contained in:
Yvan
2026-11-04 14:45:02 +08:00
parent 5a96be6a79
commit 297e80827d
176 changed files with 6803 additions and 6002 deletions
+14 -9
View File
@@ -32,9 +32,13 @@ func (a *Activation) EndAt() *time.Time {
return a.UnbindAt
}
type ActivationAccount struct {
SourceDB, Account string
}
type ActivationScope struct {
All bool
Accounts []string
Accounts []ActivationAccount
}
type ActivationFilter struct {
PlatformNames, Statuses []string
@@ -59,7 +63,7 @@ type ActivationSpendDetail struct {
}
type ActivationRepo interface {
OwnAccounts(context.Context, uint) ([]string, error)
OwnAccounts(context.Context, uint) ([]ActivationAccount, error)
List(context.Context, ActivationScope, ActivationFilter, ...ListOption) (*ActivationPage, error)
Find(context.Context, uint64) (*Activation, error)
Spend(context.Context, ActivationSpendQuery) ([]*ActivationSpendItem, error)
@@ -87,11 +91,12 @@ func (uc *ActivationUsecase) scope(ctx context.Context) (ActivationScope, error)
return ActivationScope{}, err
}
scope := ActivationScope{}
seen := map[string]bool{}
seen := map[ActivationAccount]bool{}
for _, account := range accounts {
account = strings.TrimSpace(account)
key := strings.ToLower(account)
if key != "" && !seen[key] {
account.Account = strings.TrimSpace(account.Account)
account.SourceDB, err = NormalizePlatform(account.SourceDB)
key := ActivationAccount{SourceDB: account.SourceDB, Account: strings.ToLower(account.Account)}
if err == nil && key.Account != "" && !seen[key] {
scope.Accounts = append(scope.Accounts, account)
seen[key] = true
}
@@ -105,10 +110,10 @@ func (uc *ActivationUsecase) List(ctx context.Context, filter ActivationFilter,
return nil, err
}
if !scope.All && filter.BusierAccount != "" {
matched := []string{}
matched := []ActivationAccount{}
keyword := strings.ToLower(strings.TrimSpace(filter.BusierAccount))
for _, account := range scope.Accounts {
if strings.Contains(strings.ToLower(account), keyword) {
if strings.Contains(strings.ToLower(account.Account), keyword) {
matched = append(matched, account)
}
}
@@ -139,7 +144,7 @@ func (uc *ActivationUsecase) SpendDetail(ctx context.Context, id uint64) (*Activ
if !scope.All {
found := false
for _, account := range scope.Accounts {
if strings.EqualFold(account, strings.TrimSpace(activation.BusierAccount)) {
if strings.EqualFold(account.SourceDB, strings.TrimSpace(activation.PlatformName)) && strings.EqualFold(account.Account, strings.TrimSpace(activation.BusierAccount)) {
found = true
break
}