fix: 补上第1批 M8 提交失败决策写入(6298a906 遗漏)
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 10m35s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 10m35s
- 企微提交被明确拒绝时,在同一事务内写 submission_failed 决策投递记录与终态事件
- Worker 两处 ApprovalContextRepository 注入决策写入器;未注入时提交失败直接报错,不再静默只改实例状态
- 终态决策消费入口单独放行 submission_failed,渠道回调仍不能推进到提交失败
- 6298a906 的编辑脚本在本文件锚点不唯一处中断,三处改动未落盘;本次补齐
- 第1批 ⑤ 5.4、① 5.2/5.4/5.5 测试环境验证完成
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -66,8 +66,11 @@ func (c *TerminalDecisionConsumer) Consume(ctx context.Context, envelope outbox.
|
||||
event.BusinessType == "" || event.BusinessID == 0 || event.CorrelationID == "" {
|
||||
return errors.New(errors.CodeInvalidParam, "审批标准决策事件载荷不完整")
|
||||
}
|
||||
if _, err := approvaldomain.StatusForDecision(event.Decision); err != nil {
|
||||
return err
|
||||
// submission_failed 只由审批核心在提交失败事务内发出,仅在此放行;StatusForDecision 不认该值,渠道回调仍不能推进到提交失败。
|
||||
if event.Decision != constants.ApprovalDecisionSubmissionFailed {
|
||||
if _, err := approvaldomain.StatusForDecision(event.Decision); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return c.dispatcher.Consume(ctx, event)
|
||||
}
|
||||
|
||||
@@ -36,9 +36,11 @@ type ApprovalRecoveryRecord struct {
|
||||
|
||||
// ApprovalContextRepository 管理企微提交的领取、终态和结果未知状态。
|
||||
type ApprovalContextRepository struct {
|
||||
db *gorm.DB
|
||||
audit approvalapp.AuditWriter
|
||||
now func() time.Time
|
||||
db *gorm.DB
|
||||
audit approvalapp.AuditWriter
|
||||
eventWriter approvalapp.TerminalEventWriter
|
||||
deliveryWriter approvalapp.DecisionDeliveryWriter
|
||||
now func() time.Time
|
||||
}
|
||||
|
||||
// NewApprovalContextRepository 创建企微审批渠道上下文 Repository。
|
||||
@@ -50,6 +52,14 @@ func NewApprovalContextRepository(db *gorm.DB, audits ...approvalapp.AuditWriter
|
||||
return &ApprovalContextRepository{db: db, audit: audit, now: time.Now}
|
||||
}
|
||||
|
||||
// SetDecisionWriters 注入提交失败决策所需的投递记录与终态事件写入器。
|
||||
// 提交被明确拒绝时必须在同一事务内写两者,缺任何一个都会让业务单永远停在审批中。
|
||||
func (r *ApprovalContextRepository) SetDecisionWriters(eventWriter approvalapp.TerminalEventWriter, deliveryWriter approvalapp.DecisionDeliveryWriter) *ApprovalContextRepository {
|
||||
r.eventWriter = eventWriter
|
||||
r.deliveryWriter = deliveryWriter
|
||||
return r
|
||||
}
|
||||
|
||||
// ClaimSubmission 将待提交上下文原子置为请求处理中,阻止并发或重投重复提单。
|
||||
func (r *ApprovalContextRepository) ClaimSubmission(ctx context.Context, instanceID uint) (*ApprovalSubmissionRecord, bool, error) {
|
||||
if r == nil || r.db == nil || instanceID == 0 {
|
||||
@@ -467,6 +477,10 @@ func (r *ApprovalContextRepository) markSubmissionState(ctx context.Context, ins
|
||||
if r.audit == nil {
|
||||
return errors.New(errors.CodeServiceUnavailable, "通用审批审计 Writer 未配置")
|
||||
}
|
||||
failed := approvalStatus == constants.ApprovalStatusSubmissionFailed
|
||||
if failed && (r.eventWriter == nil || r.deliveryWriter == nil) {
|
||||
return errors.New(errors.CodeServiceUnavailable, "审批提交失败决策写入器未配置")
|
||||
}
|
||||
now := r.now().UTC()
|
||||
return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
contextResult := tx.Model(&model.WeComApprovalContext{}).
|
||||
@@ -494,6 +508,12 @@ func (r *ApprovalContextRepository) markSubmissionState(ctx context.Context, ins
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
outboxEventID := ""
|
||||
if failed {
|
||||
if outboxEventID, err = r.appendSubmissionFailedDecision(ctx, tx, instance); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
beforeStatus := constants.ApprovalStatusSubmitting
|
||||
return r.audit.WriteApproval(ctx, tx, approvalapp.AuditChange{
|
||||
EventID: approvalSubmissionAuditEventID(instanceID, approvalStatus),
|
||||
@@ -504,11 +524,30 @@ func (r *ApprovalContextRepository) markSubmissionState(ctx context.Context, ins
|
||||
CorrelationID: instance.CorrelationID, BeforeStatus: &beforeStatus, AfterStatus: &approvalStatus,
|
||||
ActorKind: constants.AuditActorSystemTask, ActorID: constants.ApprovalAuditActorSubmissionWorker,
|
||||
Source: constants.AuditSourceWorker, Result: auditResult, ErrorSummary: message,
|
||||
IntegrationIDs: []string{integrationID},
|
||||
IntegrationIDs: []string{integrationID}, OutboxEventID: outboxEventID,
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
// appendSubmissionFailedDecision 在提交失败事务内写决策投递记录与终态事件,通知业务模块终止业务单。
|
||||
// 事件号沿用终态决策格式 approval:{实例ID}:submission_failed;失败原因由业务消费者按实例读取企微上下文。
|
||||
func (r *ApprovalContextRepository) appendSubmissionFailedDecision(ctx context.Context, tx *gorm.DB, instance *model.ApprovalInstance) (string, error) {
|
||||
event := approvalapp.TerminalDecisionEvent{
|
||||
EventID: "approval:" + strconv.FormatUint(uint64(instance.ID), 10) + ":" + constants.ApprovalDecisionSubmissionFailed,
|
||||
InstanceID: instance.ID, BusinessType: instance.BusinessType, BusinessID: instance.BusinessID,
|
||||
SubmitterAccountID: instance.SubmitterAccountID, Decision: constants.ApprovalDecisionSubmissionFailed,
|
||||
Source: constants.ApprovalSyncSourceSubmission, CorrelationID: instance.CorrelationID,
|
||||
OccurredAt: instance.StatusChangedAt,
|
||||
}
|
||||
if err := r.deliveryWriter.Create(ctx, tx, event); err != nil {
|
||||
return "", err
|
||||
}
|
||||
if err := r.eventWriter.Append(ctx, tx, event); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return event.EventID, nil
|
||||
}
|
||||
|
||||
func loadApprovalAuditInstance(ctx context.Context, tx *gorm.DB, instanceID uint) (*model.ApprovalInstance, error) {
|
||||
var instance model.ApprovalInstance
|
||||
if err := tx.WithContext(ctx).First(&instance, instanceID).Error; err != nil {
|
||||
|
||||
Reference in New Issue
Block a user