feat(收口): 补齐 8 月迭代缺口并同步 Spec 与证据链
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
- 新增六对成对迁移 000232–000237:H5 弹窗类型、退款结算标识与申请人备注、优先轮询事实字段与两个新终态、通道阈值命中留痕、手机号最近解绑人、提现资格校验留痕 - 退款:原因必填与申请人备注、来源支付与渠道流水冻结、线下处理流水号补录审计、按订单查询可选退款方式、企微审批材料补齐且新增字段缺失映射即明确失败 - 优先轮询:人工关闭、有效期到期独立周期任务、失败与过期人工重触发、事实字段与异常重试查询、资产解析端点只读投影 - 通道阈值:命中事实同事务留痕与命中记录查询;员工账单:列表筛选与详情投影;商户池:列表投影与统计周期语义;H5:弹窗类型与类别排序 - 手机号:有效关联数量与最近解绑人、短信验证码失败次数限制;导出:佣金明细十五列与报表序号列 - 时间筛选:三处新增筛选纳入统一严格解析契约,员工账单产生时间参数改名 - 同步 12 份主 Spec 需求、两端点与异步任务证据链,门禁 context-health 与 OpenSpec 校验通过
This commit is contained in:
@@ -331,8 +331,10 @@ func (h *PhoneAssetUnbindImportHandler) processRow(ctx context.Context, taskReco
|
||||
phones = append(phones, association.Phone)
|
||||
}
|
||||
now := time.Now()
|
||||
// CSV 导入由任务创建人发起,Worker 侧没有请求上下文,名称快照取任务落库时的创建人名称。
|
||||
affected, err := h.associationStore.WithTx(tx).InvalidateByIDs(ctx, tx, ids,
|
||||
constants.PhoneAssetAssociationInvalidateMethodCSVImport, taskRecord.UnbindReason, taskRecord.Creator, now)
|
||||
constants.PhoneAssetAssociationInvalidateMethodCSVImport, taskRecord.UnbindReason, taskRecord.Creator,
|
||||
taskRecord.CreatorName, now)
|
||||
if err != nil {
|
||||
return pkgerrors.Wrap(pkgerrors.CodeDatabaseError, err, "解除手机号资产关联失败")
|
||||
}
|
||||
|
||||
@@ -200,32 +200,43 @@ func (b *PollingBase) requeueCardAt(cardID uint, taskType string, nextCheckAt ti
|
||||
return nil
|
||||
}
|
||||
|
||||
// requeueCard 将卡按匹配配置间隔重新入队分片 Sorted Set
|
||||
// ⚠️ 关键:Lua 脚本原子出队后卡已从队列移除,若并发满时直接 return 会导致卡永久丢失
|
||||
// 调用方必须在 acquireConcurrency 返回 false 时调用此方法入队后再返回
|
||||
func (b *PollingBase) requeueCard(_ context.Context, cardID uint, taskType string) error {
|
||||
ctx, cancel := pollingFallbackContext()
|
||||
// pollingRequeueFallbackInterval 是无法解析轮询间隔时的兜底重入队间隔。
|
||||
// 防止卡或优先项因配置缺失而永久停在待执行状态。
|
||||
const pollingRequeueFallbackInterval = 30 * time.Second
|
||||
|
||||
// pollingNextCheckAt 计算该卡该任务类型的下一次检查时间,与 requeueCard 共用同一间隔解析与兜底口径。
|
||||
// 返回 ok=false 表示该任务类型没有可用轮询间隔(配置为 NULL),调用方不得入队。
|
||||
func (b *PollingBase) pollingNextCheckAt(ctx context.Context, cardID uint, taskType string) (time.Time, bool) {
|
||||
card, err := b.getCardWithCache(ctx, cardID)
|
||||
cancel()
|
||||
if err != nil {
|
||||
b.logger.Warn("重入队:获取卡信息失败,使用30秒兜底间隔",
|
||||
zap.Uint("card_id", cardID), zap.String("task_type", taskType), zap.Error(err))
|
||||
// 获取卡失败时立即重入队(下次仍然尝试处理)
|
||||
return b.requeueCardAt(cardID, taskType, time.Now().Add(30*time.Second))
|
||||
return time.Now().Add(pollingRequeueFallbackInterval), true
|
||||
}
|
||||
|
||||
intervals := b.configMgr.MergedTaskIntervals(card)
|
||||
if len(intervals) == 0 {
|
||||
// 兜底:配置未加载时延迟 30 秒重入队,防止卡从轮询永久消失
|
||||
b.logger.Warn("无匹配轮询配置,30秒后重入队(配置可能未加载)",
|
||||
zap.Uint("card_id", cardID), zap.String("task_type", taskType))
|
||||
return b.requeueCardAt(cardID, taskType, time.Now().Add(30*time.Second))
|
||||
return time.Now().Add(pollingRequeueFallbackInterval), true
|
||||
}
|
||||
info, ok := intervals[taskType]
|
||||
if !ok || info.Interval <= 0 {
|
||||
b.logger.Debug("轮询间隔为 NULL,不入队", zap.Uint("card_id", cardID), zap.String("task_type", taskType))
|
||||
return time.Time{}, false
|
||||
}
|
||||
return time.Now().Add(time.Duration(info.Interval) * time.Second), true
|
||||
}
|
||||
|
||||
// requeueCard 将卡按匹配配置间隔重新入队分片 Sorted Set
|
||||
// ⚠️ 关键:Lua 脚本原子出队后卡已从队列移除,若并发满时直接 return 会导致卡永久丢失
|
||||
// 调用方必须在 acquireConcurrency 返回 false 时调用此方法入队后再返回
|
||||
func (b *PollingBase) requeueCard(_ context.Context, cardID uint, taskType string) error {
|
||||
ctx, cancel := pollingFallbackContext()
|
||||
nextCheckAt, ok := b.pollingNextCheckAt(ctx, cardID, taskType)
|
||||
cancel()
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
nextCheckAt := time.Now().Add(time.Duration(info.Interval) * time.Second)
|
||||
return b.requeueCardAt(cardID, taskType, nextCheckAt)
|
||||
}
|
||||
|
||||
@@ -84,12 +84,12 @@ func (h *PollingCarddataHandler) Handle(ctx context.Context, task *asynq.Task) e
|
||||
attempt := newGatewayAttempt(cardID, constants.IntegrationOperationGatewayTraffic, constants.CardObservationSceneTrafficPolling)
|
||||
result, err := h.gateway.QueryFlow(ctx, &gateway.FlowQueryReq{CardNo: card.ICCID})
|
||||
if err != nil {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultFailed, false, "查询流量失败")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultFailed, false, "查询流量失败", priority)
|
||||
priority.FailRetryable(ctx, "查询流量失败")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "查询流量失败", err)
|
||||
}
|
||||
if strings.TrimSpace(result.ICCID) == "" {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultInvalidPayload, false, "流量查询响应缺少 ICCID")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultInvalidPayload, false, "流量查询响应缺少 ICCID", priority)
|
||||
priority.FailRetryable(ctx, "流量查询响应缺少 ICCID")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "流量查询响应缺少 ICCID", nil)
|
||||
}
|
||||
@@ -107,13 +107,13 @@ func (h *PollingCarddataHandler) Handle(ctx context.Context, task *asynq.Task) e
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultUnknown, false, "应用流量观测失败")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultUnknown, false, "应用流量观测失败", priority)
|
||||
priority.FailRetryable(ctx, "应用流量观测失败")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "应用流量观测失败", err)
|
||||
}
|
||||
changed := decision.IncrementMB > 0 || decision.CrossMonth
|
||||
if changed {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultSuccess, true, "流量业务事实发生变化")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultSuccess, true, "流量业务事实发生变化", priority)
|
||||
}
|
||||
if h.base.verboseLog {
|
||||
h.base.logger.Info("流量轮询详情", zap.Uint("card_id", cardID), zap.String("iccid", card.ICCID),
|
||||
|
||||
@@ -84,12 +84,12 @@ func (h *PollingCardStatusHandler) Handle(ctx context.Context, task *asynq.Task)
|
||||
attempt := newGatewayAttempt(cardID, constants.IntegrationOperationGatewayNetwork, constants.CardObservationSceneNetworkPolling)
|
||||
result, err := h.gateway.QueryCardStatus(ctx, &gateway.CardStatusReq{CardNo: card.ICCID})
|
||||
if err != nil {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultFailed, false, "查询卡状态失败")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultFailed, false, "查询卡状态失败", priority)
|
||||
priority.FailRetryable(ctx, "查询卡状态失败")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "查询卡状态失败", err)
|
||||
}
|
||||
if strings.TrimSpace(result.ICCID) == "" {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultInvalidPayload, false, "卡状态查询响应缺少 ICCID")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultInvalidPayload, false, "卡状态查询响应缺少 ICCID", priority)
|
||||
priority.FailRetryable(ctx, "卡状态查询响应缺少 ICCID")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "卡状态查询响应缺少 ICCID", nil)
|
||||
}
|
||||
@@ -107,13 +107,13 @@ func (h *PollingCardStatusHandler) Handle(ctx context.Context, task *asynq.Task)
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultUnknown, false, "应用网络状态观测失败")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultUnknown, false, "应用网络状态观测失败", priority)
|
||||
priority.FailRetryable(ctx, "应用网络状态观测失败")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "应用网络状态观测失败", err)
|
||||
}
|
||||
changed := decision.StatusChanged || decision.StopReasonChanged || decision.StopPolling
|
||||
if changed {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultSuccess, true, "网络状态发生变化")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultSuccess, true, "网络状态发生变化", priority)
|
||||
}
|
||||
if h.base.verboseLog || !decision.StatusKnown {
|
||||
h.base.logger.Info("卡状态轮询详情", zap.Uint("card_id", cardID), zap.String("iccid", card.ICCID),
|
||||
|
||||
@@ -39,6 +39,25 @@ func recordGatewayAttempt(ctx context.Context, repository *integrationlog.Reposi
|
||||
return err
|
||||
}
|
||||
|
||||
// recordPriorityGatewayAttempt 记录外部交互日志,并把真正落库的日志标识回写优先项。
|
||||
// 成功且无变化的轮询按既有语义不落库,因此只有落库成功才回写标识,避免悬挂引用;
|
||||
// 其余调用方(无优先项在途)继续使用 recordGatewayAttempt。
|
||||
func recordPriorityGatewayAttempt(
|
||||
ctx context.Context,
|
||||
repository *integrationlog.Repository,
|
||||
attempt integrationlog.Attempt,
|
||||
result string,
|
||||
changed bool,
|
||||
summary string,
|
||||
round *pollingPriorityRound,
|
||||
) error {
|
||||
if err := recordGatewayAttempt(ctx, repository, attempt, result, changed, summary); err != nil {
|
||||
return err
|
||||
}
|
||||
round.RecordIntegrationLog(attempt.IntegrationID)
|
||||
return nil
|
||||
}
|
||||
|
||||
// completeGatewayAttempt 记录 Gateway 查询成功或明确失败,不把响应正文写入日志。
|
||||
func completeGatewayAttempt(ctx context.Context, repository *integrationlog.Repository, attempt *model.IntegrationLog, success bool, startedAt time.Time) error {
|
||||
if repository == nil || attempt == nil {
|
||||
|
||||
@@ -132,7 +132,7 @@ func (b *PollingBase) priorityInPollingScope(_ context.Context, round *pollingPr
|
||||
return false
|
||||
}
|
||||
|
||||
// MarkExecution 标记即将真正发起上游调用,并在调用之前累加尝试次数。
|
||||
// MarkExecution 标记即将真正发起上游调用,并在调用之前累加尝试次数与执行开始时间。
|
||||
// 崩溃遗留的执行中项被接管后据此按尝试上限收敛。
|
||||
func (r *pollingPriorityRound) MarkExecution(_ context.Context) {
|
||||
if r == nil {
|
||||
@@ -140,7 +140,8 @@ func (r *pollingPriorityRound) MarkExecution(_ context.Context) {
|
||||
}
|
||||
ctx, cancel := pollingFallbackContext()
|
||||
defer cancel()
|
||||
hit, err := r.base.priorityStore.IncrementAttempt(ctx, r.item.ID)
|
||||
now := time.Now()
|
||||
hit, err := r.base.priorityStore.MarkExecutionStarted(ctx, r.item.ID, now)
|
||||
if err != nil {
|
||||
r.base.logger.Warn("累加优先轮询项尝试次数失败",
|
||||
zap.Uint("priority_item_id", r.item.ID), zap.Error(err))
|
||||
@@ -151,6 +152,40 @@ func (r *pollingPriorityRound) MarkExecution(_ context.Context) {
|
||||
}
|
||||
r.attempts = r.item.AttemptCount + 1
|
||||
r.item.AttemptCount = r.attempts
|
||||
r.item.StartedAt = &now
|
||||
r.item.FinishedAt = nil
|
||||
r.item.NextRunAt = nil
|
||||
}
|
||||
|
||||
// RecordIntegrationLog 把本次执行对应的集成交互日志标识写回优先项。
|
||||
// 只保存日志标识(不复制凭证或响应原文);写入失败只损失溯源细节,不阻断执行。
|
||||
func (r *pollingPriorityRound) RecordIntegrationLog(integrationLogID string) {
|
||||
if r == nil || r.item == nil || integrationLogID == "" {
|
||||
return
|
||||
}
|
||||
ctx, cancel := pollingFallbackContext()
|
||||
defer cancel()
|
||||
if err := r.base.priorityStore.RecordIntegrationLog(ctx, r.item.ID, integrationLogID); err != nil {
|
||||
r.base.logger.Warn("记录优先轮询项集成交互日志标识失败",
|
||||
zap.Uint("priority_item_id", r.item.ID), zap.Error(err))
|
||||
return
|
||||
}
|
||||
r.item.IntegrationLogID = integrationLogID
|
||||
}
|
||||
|
||||
// nextRunAt 计算该项退回活动态后的下一次计划执行时间,复用与重入队完全相同的间隔解析。
|
||||
func (r *pollingPriorityRound) nextRunAt() time.Time {
|
||||
if r == nil || r.base == nil {
|
||||
return time.Now().Add(pollingRequeueFallbackInterval)
|
||||
}
|
||||
ctx, cancel := pollingFallbackContext()
|
||||
defer cancel()
|
||||
nextCheckAt, ok := r.base.pollingNextCheckAt(ctx, r.item.CardID, r.taskType)
|
||||
if !ok {
|
||||
// 该任务类型轮询间隔为 NULL:普通轮询不会接管,仍写下兜底时间让重试路径可见。
|
||||
return time.Now().Add(pollingRequeueFallbackInterval)
|
||||
}
|
||||
return nextCheckAt
|
||||
}
|
||||
|
||||
// Complete 记录优先项执行成功并出队,该卡继续按普通轮询运行。
|
||||
@@ -161,6 +196,7 @@ func (r *pollingPriorityRound) Complete(_ context.Context) {
|
||||
ctx, cancel := pollingFallbackContext()
|
||||
defer cancel()
|
||||
before := r.stateData()
|
||||
finishedAt := time.Now()
|
||||
hit, err := r.base.priorityStore.MarkCompleted(ctx, r.item.ID)
|
||||
if err != nil {
|
||||
r.base.logger.Warn("更新优先轮询项完成状态失败",
|
||||
@@ -174,11 +210,14 @@ func (r *pollingPriorityRound) Complete(_ context.Context) {
|
||||
r.item.Status = constants.PollingPriorityStatusCompleted
|
||||
r.item.Result = constants.PollingPriorityResultSuccess
|
||||
r.item.FailureReason = ""
|
||||
r.item.FinishedAt = &finishedAt
|
||||
r.item.DequeuedAt = &finishedAt
|
||||
r.item.NextRunAt = nil
|
||||
r.writeAudit(constants.AuditActionPollingPriorityCompleted, "卡轮询优先项执行完成并出队", constants.AuditResultSuccess, "", "", before)
|
||||
}
|
||||
|
||||
// FailRetryable 记录一次可恢复失败(上游超时、失败或响应无效)。
|
||||
// 未达尝试上限时退回活动态并按既有轮询间隔由调用方重排;达到上限时记录失败终态并出队。
|
||||
// 未达尝试上限时退回活动态并写下一次计划执行时间;达到上限时记录失败终态并出队。
|
||||
func (r *pollingPriorityRound) FailRetryable(_ context.Context, reason string) {
|
||||
if r == nil {
|
||||
return
|
||||
@@ -186,8 +225,10 @@ func (r *pollingPriorityRound) FailRetryable(_ context.Context, reason string) {
|
||||
ctx, cancel := pollingFallbackContext()
|
||||
defer cancel()
|
||||
before := r.stateData()
|
||||
finishedAt := time.Now()
|
||||
if r.attempts < constants.PollingPriorityMaxAttempts {
|
||||
hit, err := r.base.priorityStore.ReturnToPending(ctx, r.item.ID, reason)
|
||||
nextRunAt := r.nextRunAt()
|
||||
hit, err := r.base.priorityStore.ReturnToPending(ctx, r.item.ID, reason, nextRunAt)
|
||||
if err != nil {
|
||||
r.base.logger.Warn("退回优先轮询项活动状态失败",
|
||||
zap.Uint("priority_item_id", r.item.ID), zap.Error(err))
|
||||
@@ -201,6 +242,8 @@ func (r *pollingPriorityRound) FailRetryable(_ context.Context, reason string) {
|
||||
r.item.Result = constants.PollingPriorityResultFailed
|
||||
r.item.FailureReason = reason
|
||||
r.item.ClaimedAt = nil
|
||||
r.item.FinishedAt = &finishedAt
|
||||
r.item.NextRunAt = &nextRunAt
|
||||
r.writeAudit(constants.AuditActionPollingPriorityFailed, "卡轮询优先项执行失败", constants.AuditResultFailed, "", reason, before)
|
||||
r.writeAudit(constants.AuditActionPollingPriorityRetried, "卡轮询优先项未达尝试上限,退回活动态重新排期", constants.AuditResultFailed, "", reason, before)
|
||||
return
|
||||
@@ -219,6 +262,9 @@ func (r *pollingPriorityRound) FailRetryable(_ context.Context, reason string) {
|
||||
r.item.Status = constants.PollingPriorityStatusFailed
|
||||
r.item.Result = constants.PollingPriorityResultFailed
|
||||
r.item.FailureReason = reason
|
||||
r.item.FinishedAt = &finishedAt
|
||||
r.item.DequeuedAt = &finishedAt
|
||||
r.item.NextRunAt = nil
|
||||
r.writeAudit(constants.AuditActionPollingPriorityFailed, "卡轮询优先项执行失败", constants.AuditResultFailed, "", reason, before)
|
||||
r.writeAudit(constants.AuditActionPollingPriorityDequeued, "卡轮询优先项达到尝试上限,失败出队", constants.AuditResultFailed, "", reason, before)
|
||||
}
|
||||
@@ -241,9 +287,13 @@ func (r *pollingPriorityRound) FailFinal(_ context.Context, reason string) {
|
||||
zap.Uint("priority_item_id", r.item.ID))
|
||||
return
|
||||
}
|
||||
finishedAt := time.Now()
|
||||
r.item.Status = constants.PollingPriorityStatusFailed
|
||||
r.item.Result = constants.PollingPriorityResultFailed
|
||||
r.item.FailureReason = reason
|
||||
r.item.FinishedAt = &finishedAt
|
||||
r.item.DequeuedAt = &finishedAt
|
||||
r.item.NextRunAt = nil
|
||||
r.writeAudit(constants.AuditActionPollingPriorityFailed, "卡轮询优先项执行业务校验失败", constants.AuditResultFailed, "", reason, before)
|
||||
r.writeAudit(constants.AuditActionPollingPriorityDequeued, "卡轮询优先项失败出队且不重试", constants.AuditResultFailed, "", reason, before)
|
||||
}
|
||||
@@ -251,17 +301,23 @@ func (r *pollingPriorityRound) FailFinal(_ context.Context, reason string) {
|
||||
// stateData 返回当前优先项状态的前后值快照,覆盖触发来源、操作来源、时间与执行结果。
|
||||
func (r *pollingPriorityRound) stateData() map[string]any {
|
||||
return map[string]any{
|
||||
"status": r.item.Status,
|
||||
"result": r.item.Result,
|
||||
"trigger_type": r.item.TriggerType,
|
||||
"trigger_types": r.item.TriggerTypes,
|
||||
"trigger_count": r.item.TriggerCount,
|
||||
"last_triggered_at": r.item.LastTriggeredAt,
|
||||
"attempt_count": r.item.AttemptCount,
|
||||
"claimed_at": r.item.ClaimedAt,
|
||||
"failure_reason": r.item.FailureReason,
|
||||
"source": constants.AuditSourceWorker,
|
||||
"occurred_at": time.Now(),
|
||||
"status": r.item.Status,
|
||||
"result": r.item.Result,
|
||||
"trigger_type": r.item.TriggerType,
|
||||
"trigger_types": r.item.TriggerTypes,
|
||||
"trigger_count": r.item.TriggerCount,
|
||||
"last_triggered_at": r.item.LastTriggeredAt,
|
||||
"attempt_count": r.item.AttemptCount,
|
||||
"attempt_limit": r.item.AttemptLimit,
|
||||
"claimed_at": r.item.ClaimedAt,
|
||||
"started_at": r.item.StartedAt,
|
||||
"finished_at": r.item.FinishedAt,
|
||||
"next_run_at": r.item.NextRunAt,
|
||||
"dequeued_at": r.item.DequeuedAt,
|
||||
"integration_log_id": r.item.IntegrationLogID,
|
||||
"failure_reason": r.item.FailureReason,
|
||||
"source": constants.AuditSourceWorker,
|
||||
"occurred_at": time.Now(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
57
internal/task/polling_priority_expiry.go
Normal file
57
internal/task/polling_priority_expiry.go
Normal file
@@ -0,0 +1,57 @@
|
||||
package task
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/hibiken/asynq"
|
||||
"go.uber.org/zap"
|
||||
|
||||
pollingSvc "github.com/break/junhong_cmp_fiber/internal/service/polling"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/auditcontext"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
)
|
||||
|
||||
// PollingPriorityExpiryHandler 执行优先轮询项有效期到期处理任务。
|
||||
//
|
||||
// 该任务只做一件事:把超过固定有效期仍未完成的优先项转已过期终态并出队。
|
||||
// 到期判定与查询、读侧完全解耦,读接口 MUST NOT 隐式触发过期处理;
|
||||
// 本轮扫描未处理完的剩余项由下一轮计划任务继续,任务可重复执行。
|
||||
type PollingPriorityExpiryHandler struct {
|
||||
service *pollingSvc.PriorityExpiryService
|
||||
logger *zap.Logger
|
||||
}
|
||||
|
||||
// NewPollingPriorityExpiryHandler 创建优先轮询项有效期到期处理任务处理器。
|
||||
func NewPollingPriorityExpiryHandler(service *pollingSvc.PriorityExpiryService, logger *zap.Logger) *PollingPriorityExpiryHandler {
|
||||
if logger == nil {
|
||||
logger = zap.NewNop()
|
||||
}
|
||||
return &PollingPriorityExpiryHandler{service: service, logger: logger}
|
||||
}
|
||||
|
||||
// Handle 执行一次有效期到期扫描。
|
||||
// 审计上下文固定为计划任务来源,与审计注册表中该动作允许的操作者与来源一致。
|
||||
func (h *PollingPriorityExpiryHandler) Handle(ctx context.Context, task *asynq.Task) error {
|
||||
if h == nil || h.service == nil {
|
||||
return errors.New(errors.CodeServiceUnavailable, "优先轮询项有效期到期处理任务未配置")
|
||||
}
|
||||
taskType := constants.TaskTypePollingPriorityExpiry
|
||||
if task != nil && task.Type() != "" {
|
||||
taskType = task.Type()
|
||||
}
|
||||
ctx = auditcontext.With(ctx, auditcontext.Context{
|
||||
ActorKind: constants.AuditActorScheduledJob, ActorID: taskType,
|
||||
ActorName: "优先轮询项有效期到期处理计划任务", Source: constants.AuditSourceScheduler,
|
||||
})
|
||||
expiredCount, err := h.service.ExpireOverdue(ctx, time.Now().UTC())
|
||||
if err != nil {
|
||||
h.logger.Error("优先轮询项有效期到期处理失败", zap.Error(err))
|
||||
return err
|
||||
}
|
||||
if expiredCount > 0 {
|
||||
h.logger.Info("优先轮询项有效期到期处理完成", zap.Int("expired_count", expiredCount))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -75,12 +75,12 @@ func (h *PollingRealnameHandler) Handle(ctx context.Context, task *asynq.Task) e
|
||||
attempt := newGatewayAttempt(cardID, constants.IntegrationOperationGatewayRealname, constants.CardObservationSceneRealnamePolling)
|
||||
result, err := h.gateway.QueryRealnameStatus(ctx, &gateway.CardStatusReq{CardNo: card.ICCID})
|
||||
if err != nil {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultFailed, false, "查询实名状态失败")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultFailed, false, "查询实名状态失败", priority)
|
||||
priority.FailRetryable(ctx, "查询实名状态失败")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "查询实名状态失败", err)
|
||||
}
|
||||
if strings.TrimSpace(result.ICCID) == "" {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultInvalidPayload, false, "实名查询响应缺少 ICCID")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultInvalidPayload, false, "实名查询响应缺少 ICCID", priority)
|
||||
priority.FailRetryable(ctx, "实名查询响应缺少 ICCID")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "实名查询响应缺少 ICCID", nil)
|
||||
}
|
||||
@@ -98,13 +98,13 @@ func (h *PollingRealnameHandler) Handle(ctx context.Context, task *asynq.Task) e
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultUnknown, false, "应用实名观测失败")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultUnknown, false, "应用实名观测失败", priority)
|
||||
priority.FailRetryable(ctx, "应用实名观测失败")
|
||||
return h.failAndRequeue(ctx, cardID, startedAt, "应用实名观测失败", err)
|
||||
}
|
||||
changed := decision.StatusChanged
|
||||
if changed {
|
||||
_ = recordGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultSuccess, true, "实名状态发生变化")
|
||||
_ = recordPriorityGatewayAttempt(ctx, h.integration, attempt, constants.IntegrationResultSuccess, true, "实名状态发生变化", priority)
|
||||
}
|
||||
if h.base.verboseLog {
|
||||
h.base.logger.Info("实名状态轮询详情", zap.Uint("card_id", cardID), zap.String("iccid", card.ICCID),
|
||||
|
||||
Reference in New Issue
Block a user