修复加油包独立有效期和流量重置
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 12m22s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 12m22s
This commit is contained in:
@@ -123,49 +123,43 @@ func (h *PackageActivationHandler) syncTrafficBeforeExpiry(ctx context.Context,
|
||||
}
|
||||
}
|
||||
|
||||
// HandlePackageActivationCheck 任务 19.2-19.5: 处理套餐激活检查
|
||||
// 每 10 秒调度一次,检查过期主套餐并激活下一个待生效主套餐
|
||||
// HandlePackageActivationCheck 任务 19.2-19.6: 处理套餐激活检查
|
||||
// 每 10 秒调度一次,检查主套餐和拥有独立有效期的加油包。
|
||||
func (h *PackageActivationHandler) HandlePackageActivationCheck(ctx context.Context) error {
|
||||
startTime := time.Now()
|
||||
|
||||
// 任务 19.2: 查询已过期的主套餐(status IN (1,2) AND expires_at <= NOW)
|
||||
// 任务 19.2-19.5:处理过期主套餐及其关联加油包。
|
||||
expiredPackages, err := h.findExpiredMainPackages(ctx)
|
||||
if err != nil {
|
||||
h.logger.Error("查询过期主套餐失败", zap.Error(err))
|
||||
return err
|
||||
}
|
||||
|
||||
if len(expiredPackages) > 0 {
|
||||
h.logger.Info("发现过期主套餐",
|
||||
zap.Int("count", len(expiredPackages)),
|
||||
zap.Duration("check_duration", time.Since(startTime)))
|
||||
|
||||
// 处理每个过期的主套餐
|
||||
for _, pkg := range expiredPackages {
|
||||
if err := h.processExpiredPackage(ctx, pkg); err != nil {
|
||||
h.logger.Error("处理过期套餐失败",
|
||||
zap.Uint("package_usage_id", pkg.ID),
|
||||
zap.Error(err))
|
||||
// 继续处理下一个,不中断
|
||||
continue
|
||||
}
|
||||
for _, pkg := range expiredPackages {
|
||||
if err := h.processExpiredPackage(ctx, pkg); err != nil {
|
||||
h.logger.Error("处理过期套餐失败", zap.Uint("package_usage_id", pkg.ID), zap.Error(err))
|
||||
}
|
||||
|
||||
h.logger.Info("套餐激活检查完成",
|
||||
zap.Int("processed", len(expiredPackages)),
|
||||
zap.Duration("total_duration", time.Since(startTime)))
|
||||
}
|
||||
|
||||
// 任务 6: 孤儿套餐扫描
|
||||
// 任务 19.6:独立有效期加油包单独到期,不等待主套餐到期。
|
||||
expiredAddons, err := h.findExpiredIndependentAddons(ctx)
|
||||
if err != nil {
|
||||
h.logger.Error("查询独立有效期加油包失败", zap.Error(err))
|
||||
return err
|
||||
}
|
||||
for _, addon := range expiredAddons {
|
||||
if err := h.processExpiredIndependentAddon(ctx, addon); err != nil {
|
||||
h.logger.Error("处理独立有效期加油包失败", zap.Uint("package_usage_id", addon.ID), zap.Error(err))
|
||||
}
|
||||
}
|
||||
|
||||
// 孤儿套餐扫描仍照常执行。
|
||||
orphanCount, err := h.findAndActivateOrphanPackages(ctx)
|
||||
if err != nil {
|
||||
h.logger.Error("孤儿套餐扫描失败", zap.Error(err))
|
||||
// 不中断主流程
|
||||
} else if orphanCount > 0 {
|
||||
h.logger.Info("孤儿套餐扫描完成",
|
||||
zap.Int("orphan_count", orphanCount))
|
||||
h.logger.Info("孤儿套餐扫描完成", zap.Int("orphan_count", orphanCount))
|
||||
}
|
||||
|
||||
h.logger.Debug("套餐激活检查完成", zap.Int("expired_main_count", len(expiredPackages)), zap.Int("expired_addon_count", len(expiredAddons)), zap.Duration("total_duration", time.Since(startTime)))
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -252,6 +246,39 @@ func (h *PackageActivationHandler) findExpiredMainPackages(ctx context.Context)
|
||||
return packages, err
|
||||
}
|
||||
|
||||
// findExpiredIndependentAddons 查询拥有独立有效期且已到期的加油包。
|
||||
func (h *PackageActivationHandler) findExpiredIndependentAddons(ctx context.Context) ([]*model.PackageUsage, error) {
|
||||
var addons []*model.PackageUsage
|
||||
err := h.db.WithContext(ctx).
|
||||
Where("status IN ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}).
|
||||
Where("master_usage_id IS NOT NULL AND has_independent_expiry = ?", true).
|
||||
Where("expires_at IS NOT NULL AND expires_at <= ?", time.Now()).
|
||||
Limit(1000).
|
||||
Find(&addons).Error
|
||||
return addons, err
|
||||
}
|
||||
|
||||
// processExpiredIndependentAddon 将独立有效期加油包标记为已过期,不影响主套餐和其他加油包。
|
||||
func (h *PackageActivationHandler) processExpiredIndependentAddon(ctx context.Context, addon *model.PackageUsage) error {
|
||||
return h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
result := tx.Model(addon).
|
||||
Where("status IN ? AND has_independent_expiry = ? AND expires_at IS NOT NULL AND expires_at <= ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}, true, time.Now()).
|
||||
Update("status", constants.PackageUsageStatusExpired)
|
||||
if result.Error != nil {
|
||||
return result.Error
|
||||
}
|
||||
if result.RowsAffected == 0 {
|
||||
return nil
|
||||
}
|
||||
if h.activationService == nil {
|
||||
return errors.New(errors.CodeInternalError, "套餐激活服务未注入")
|
||||
}
|
||||
return h.activationService.AppendAddonExpirationAudit(ctx, tx, addon)
|
||||
})
|
||||
}
|
||||
|
||||
// findAndActivateOrphanPackages 任务 6.1-6.2: 查找孤儿载体并触发激活
|
||||
|
||||
// processExpiredPackage 处理单个过期套餐
|
||||
// 流程:先同步最新流量 → 事务内标记过期和失效加油包 → 提交后投递下一套餐;
|
||||
// 仅明确没有后续套餐时才触发停机检查,避免与异步激活任务竞态。
|
||||
|
||||
Reference in New Issue
Block a user