feat: 分层轮询、重置日前加密与激活前流量结算
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m37s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m37s
- 轮询配置新增套餐状态、资产状态、重置日前窗口与窗口内流量间隔(迁移 248),间隔三态:正数按间隔、0 不检查、空继承 - 配置按 priority, id 排序合并;在库与已销售无套餐未匹配时告警不入队 - 新增优先级整体重排、匹配预览、立即重算到期时间(异步只提前)、分层统计与重置日前加密统计接口 - 已切换日快照计量的卡流量按观测时间归属,激活前用量只记已结算 - 订单购买与实名激活补齐资产级激活锁,激活前对已切换卡结算一次流量,失败只告警不阻塞,结算不触发通道阈值判定
This commit is contained in:
@@ -35,6 +35,55 @@ type ActivationService struct {
|
||||
observationSeriesEvents cardObservationApp.SeriesEventWriter
|
||||
priorityEvents priorityapp.PriorityEventWriter
|
||||
auditWriter *audit.Writer
|
||||
preActivationSettler PreActivationSettler // 激活前流量结算,可选
|
||||
}
|
||||
|
||||
// PreActivationSettler 在资产从无生效主套餐变为有生效主套餐之前做一次流量结算(尽力而为,不阻塞激活)。
|
||||
type PreActivationSettler interface {
|
||||
SettleBeforeActivation(ctx context.Context, carrierType string, carrierID uint)
|
||||
}
|
||||
|
||||
// SetPreActivationSettler 注入激活前流量结算器;未注入时不做结算。
|
||||
func (s *ActivationService) SetPreActivationSettler(settler PreActivationSettler) {
|
||||
s.preActivationSettler = settler
|
||||
}
|
||||
|
||||
// settleBeforeActivation 在激活锁内、激活事务开始前执行激活前流量结算;外部调用不得放进数据库事务(ENG-TX-001)。
|
||||
func (s *ActivationService) settleBeforeActivation(ctx context.Context, carrierType string, carrierID uint) {
|
||||
if s.preActivationSettler != nil {
|
||||
s.preActivationSettler.SettleBeforeActivation(ctx, carrierType, carrierID)
|
||||
}
|
||||
}
|
||||
|
||||
// waitActivationLock 实名激活抢资产级激活锁:最多等待 5 秒,抢不到时照常继续(不能跳过,否则实名回调触发的激活会丢失)。
|
||||
func (s *ActivationService) waitActivationLock(ctx context.Context, carrierType string, carrierID uint) func() {
|
||||
if s.redis == nil {
|
||||
return func() {}
|
||||
}
|
||||
key := constants.RedisPackageActivationLockKey(carrierType, carrierID)
|
||||
token := time.Now().String()
|
||||
deadline := time.Now().Add(5 * time.Second)
|
||||
for {
|
||||
locked, err := s.redis.SetNX(ctx, key, token, constants.PackageActivationLockSeconds*time.Second).Result()
|
||||
if err == nil && locked {
|
||||
return func() {
|
||||
releaseCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 2*time.Second)
|
||||
defer cancel()
|
||||
if current, getErr := s.redis.Get(releaseCtx, key).Result(); getErr == nil && current == token {
|
||||
s.redis.Del(releaseCtx, key)
|
||||
}
|
||||
}
|
||||
}
|
||||
if err != nil || time.Now().After(deadline) {
|
||||
s.logger.Warn("实名激活未能获取资产级激活锁,继续执行", zap.String("carrier_type", carrierType), zap.Uint("carrier_id", carrierID), zap.Error(err))
|
||||
return func() {}
|
||||
}
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return func() {}
|
||||
case <-time.After(200 * time.Millisecond):
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// SetLifecycleAudit 注入套餐权益生命周期统一审计 Writer。
|
||||
@@ -102,6 +151,10 @@ func (s *ActivationService) ActivateByRealname(ctx context.Context, carrierType
|
||||
return nil
|
||||
}
|
||||
|
||||
release := s.waitActivationLock(ctx, carrierType, carrierID)
|
||||
defer release()
|
||||
s.settleBeforeActivation(ctx, carrierType, carrierID)
|
||||
|
||||
now := time.Now()
|
||||
|
||||
activated := false
|
||||
@@ -219,7 +272,7 @@ func (s *ActivationService) ActivateQueuedPackage(ctx context.Context, carrierTy
|
||||
// 使用 Redis 分布式锁避免并发
|
||||
lockKey := constants.RedisPackageActivationLockKey(carrierType, carrierID)
|
||||
lockValue := time.Now().String()
|
||||
locked, err := s.redis.SetNX(ctx, lockKey, lockValue, 30*time.Second).Result()
|
||||
locked, err := s.redis.SetNX(ctx, lockKey, lockValue, constants.PackageActivationLockSeconds*time.Second).Result()
|
||||
if err != nil {
|
||||
return errors.Wrap(errors.CodeRedisError, err, "获取分布式锁失败")
|
||||
}
|
||||
@@ -233,6 +286,8 @@ func (s *ActivationService) ActivateQueuedPackage(ctx context.Context, carrierTy
|
||||
|
||||
activated := false
|
||||
var failedUsage *model.PackageUsage
|
||||
s.settleBeforeActivation(ctx, carrierType, carrierID)
|
||||
|
||||
err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
// 任务 9.5: 检测并标记过期的主套餐
|
||||
now := time.Now()
|
||||
@@ -336,7 +391,7 @@ func (s *ActivationService) ActivateSpecificPackage(ctx context.Context, package
|
||||
// 获取分布式锁
|
||||
lockKey := constants.RedisPackageActivationLockKey(carrierType, carrierID)
|
||||
lockValue := time.Now().String()
|
||||
locked, err := s.redis.SetNX(ctx, lockKey, lockValue, 30*time.Second).Result()
|
||||
locked, err := s.redis.SetNX(ctx, lockKey, lockValue, constants.PackageActivationLockSeconds*time.Second).Result()
|
||||
if err != nil {
|
||||
return errors.Wrap(errors.CodeRedisError, err, "获取分布式锁失败")
|
||||
}
|
||||
@@ -356,6 +411,8 @@ func (s *ActivationService) ActivateSpecificPackage(ctx context.Context, package
|
||||
|
||||
// 事务内激活
|
||||
activated := false
|
||||
s.settleBeforeActivation(ctx, carrierType, carrierID)
|
||||
|
||||
err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
// 再次幂等检查(防止锁释放期间被其他操作激活)
|
||||
var currentUsage model.PackageUsage
|
||||
@@ -419,7 +476,7 @@ func (s *ActivationService) ActivateNextPendingMainPackage(ctx context.Context,
|
||||
|
||||
lockKey := constants.RedisPackageActivationLockKey(carrierType, carrierID)
|
||||
lockValue := time.Now().String()
|
||||
locked, err := s.redis.SetNX(ctx, lockKey, lockValue, 30*time.Second).Result()
|
||||
locked, err := s.redis.SetNX(ctx, lockKey, lockValue, constants.PackageActivationLockSeconds*time.Second).Result()
|
||||
if err != nil {
|
||||
return false, errors.Wrap(errors.CodeRedisError, err, "获取分布式锁失败")
|
||||
}
|
||||
@@ -433,6 +490,8 @@ func (s *ActivationService) ActivateNextPendingMainPackage(ctx context.Context,
|
||||
|
||||
activated := false
|
||||
var failedUsage *model.PackageUsage
|
||||
s.settleBeforeActivation(ctx, carrierType, carrierID)
|
||||
|
||||
err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
hasActive, err := s.hasActiveMainPackage(ctx, tx, carrierType, carrierID)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user