feat:Rock刷新去UID拦截,新增绑定错误自动刷新与使用/绑定超时预警
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"affiliate_dash/internal/model"
|
||||
|
||||
@@ -15,6 +16,10 @@ import (
|
||||
const (
|
||||
rockTokenBatchDeleteMax = 500
|
||||
rockTokenDeleteAllMax = 5000
|
||||
|
||||
// 虚拟筛选状态:不落库,只在查询时换算成「主状态 + 时间阈值」。
|
||||
rockTokenStatusUsingOverdue = "using_overdue"
|
||||
rockTokenStatusBoundOverdue = "bound_overdue"
|
||||
)
|
||||
|
||||
var rockTokenDangerousStatuses = map[string]bool{
|
||||
@@ -80,17 +85,56 @@ func (e *RockTokenDeleteConflictError) Error() string {
|
||||
func isKnownRockTokenStatus(status string) bool {
|
||||
switch status {
|
||||
case "", model.RockStatusAvailable, model.RockStatusUsing, model.RockStatusBound,
|
||||
model.RockStatusRedeemed, model.RockStatusMismatch, model.RockStatusAbnormal:
|
||||
model.RockStatusRedeemed, model.RockStatusMismatch, model.RockStatusAbnormal,
|
||||
rockTokenStatusUsingOverdue, rockTokenStatusBoundOverdue:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// rockOverdueThresholds 返回生效的预警阈值(含默认值兜底),统计与筛选共用。
|
||||
func rockOverdueThresholds(cfg *model.RockConfig) (warnDays, dangerDays, boundWarnDays int) {
|
||||
warnDays, dangerDays, boundWarnDays = 3, 5, 2
|
||||
if cfg == nil {
|
||||
return
|
||||
}
|
||||
if cfg.UsingWarnDays > 0 {
|
||||
warnDays = cfg.UsingWarnDays
|
||||
}
|
||||
if cfg.UsingDangerDays > warnDays {
|
||||
dangerDays = cfg.UsingDangerDays
|
||||
} else {
|
||||
dangerDays = warnDays + 2
|
||||
}
|
||||
if cfg.BoundWarnDays > 0 {
|
||||
boundWarnDays = cfg.BoundWarnDays
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// rockOverdueCutoff 返回「超过 days 天」的时间分界点。
|
||||
func rockOverdueCutoff(now time.Time, days int) time.Time {
|
||||
if days <= 0 {
|
||||
days = 1
|
||||
}
|
||||
return now.AddDate(0, 0, -days)
|
||||
}
|
||||
|
||||
// applyRockTokenListFilters 与 Token 列表使用同一套筛选条件,避免“看到多少、删多少”不一致。
|
||||
func applyRockTokenListFilters(db *gorm.DB, status, search string) *gorm.DB {
|
||||
if value := strings.TrimSpace(status); value != "" {
|
||||
db = db.Where("status = ?", value)
|
||||
// 列表、删除预览、全部删除、回收站共用;now 由调用方传入以便同一请求内阈值一致。
|
||||
func applyRockTokenListFilters(db *gorm.DB, status, search string, now time.Time, warnDays, boundWarnDays int) *gorm.DB {
|
||||
switch strings.TrimSpace(status) {
|
||||
case rockTokenStatusUsingOverdue:
|
||||
db = db.Where("status = ? AND using_at IS NOT NULL AND using_at <= ?",
|
||||
model.RockStatusUsing, rockOverdueCutoff(now, warnDays))
|
||||
case rockTokenStatusBoundOverdue:
|
||||
db = db.Where("status = ? AND bound_at IS NOT NULL AND bound_at <= ?",
|
||||
model.RockStatusBound, rockOverdueCutoff(now, boundWarnDays))
|
||||
default:
|
||||
if value := strings.TrimSpace(status); value != "" {
|
||||
db = db.Where("status = ?", value)
|
||||
}
|
||||
}
|
||||
if value := strings.TrimSpace(search); value != "" {
|
||||
term := "%" + value + "%"
|
||||
@@ -157,7 +201,12 @@ func (s *RockService) PreviewRockTokenDelete(ctx context.Context, status, search
|
||||
return nil, errors.New("无效的 Token 状态筛选")
|
||||
}
|
||||
var rows []model.RockToken
|
||||
query := applyRockTokenListFilters(s.db.WithContext(ctx).Model(&model.RockToken{}), status, search)
|
||||
cfg, err := s.GetConfig(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
warnDays, _, boundWarnDays := rockOverdueThresholds(cfg)
|
||||
query := applyRockTokenListFilters(s.db.WithContext(ctx).Model(&model.RockToken{}), status, search, time.Now(), warnDays, boundWarnDays)
|
||||
if err := query.Order("id DESC").Find(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -250,9 +299,15 @@ func (s *RockService) DeleteAllRockTokens(ctx context.Context, status, search st
|
||||
}
|
||||
|
||||
result := &RockTokenDeleteResult{Forced: force}
|
||||
err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
cfg, err := s.GetConfig(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
warnDays, _, boundWarnDays := rockOverdueThresholds(cfg)
|
||||
filterNow := time.Now()
|
||||
err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var rows []model.RockToken
|
||||
query := applyRockTokenListFilters(tx.Model(&model.RockToken{}), status, search)
|
||||
query := applyRockTokenListFilters(tx.Model(&model.RockToken{}), status, search, filterNow, warnDays, boundWarnDays)
|
||||
if err := query.Clauses(clause.Locking{Strength: "UPDATE"}).Order("id ASC").Find(&rows).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user