fix: 第1批 M8、M13、M14 审批提交失败终态与退款关闭类终态定位
- 审批核心在实例进入提交失败的同一事务内写 submission_failed 决策投递与终态事件,消费入口单独放行 - 核销(4)、退款(7)、扫码注册(3)、资料资格(4)、线下充值(7)、佣金提现(5)新增“审批提交失败”终态并释放预占/冻结 - 三处恢复入口不再重放提交失败;退款关闭类终态按审批尝试定位退款单(M13) - 核销列表与详情批量返回审批提交状态;筛选、字段说明、状态名称、退款导出加入新状态 - 迁移 000239 放宽五张业务表状态约束与决策投递取值约束(测试库已执行 up/down/up) - OpenSpec Change fix-approval-submission-failure-terminal:18/26,测试部署后端到端验证与存量补数据待完成
This commit is contained in:
@@ -161,8 +161,8 @@ func (s *ApplicationService) RecoverApproval(ctx context.Context, applicationID
|
||||
action = "unknown"
|
||||
recoveryErr = s.recovery.EnqueueUnknownConfirm(ctx, tx, instance.ID)
|
||||
} else if instance.Status == constants.ApprovalStatusSubmissionFailed && wc.SubmissionStatus == constants.WeComSubmissionStatusFailed {
|
||||
action = "replay"
|
||||
_, recoveryErr = s.recovery.RecoverSubmissionEvent(ctx, tx, instance.ID)
|
||||
// 提交失败已由决策终止业务单,重放会造成“业务单终态、企微又生成审批”的分裂。
|
||||
return errors.New(errors.CodeConflict, constants.ApprovalSubmissionFailedNotRecoverableMessage)
|
||||
} else if instance.Status != constants.ApprovalStatusSubmitting && instance.Status != constants.ApprovalStatusPending && wc.SubmissionStatus != constants.WeComSubmissionStatusReady && wc.SubmissionStatus != constants.WeComSubmissionStatusSending {
|
||||
return errors.New(errors.CodeConflict, "当前审批提交状态不允许恢复")
|
||||
}
|
||||
|
||||
@@ -70,6 +70,13 @@ func (h *ApprovalDecisionHandler) Handle(ctx context.Context, event approvalapp.
|
||||
constants.EmployeeCollectionApplicationStatusRevoked, "企业微信审批已删除")
|
||||
case constants.ApprovalDecisionRevokedAfterApproved:
|
||||
return h.applyRevoked(ctx, tx, application, &attempt, event)
|
||||
case constants.ApprovalDecisionSubmissionFailed:
|
||||
reason, failed, err := approvalapp.ConfirmSubmissionFailed(ctx, tx, event.InstanceID)
|
||||
if err != nil || !failed {
|
||||
return err
|
||||
}
|
||||
return h.applyClosed(ctx, tx, application, &attempt, event,
|
||||
constants.EmployeeCollectionApplicationStatusSubmissionFailed, reason)
|
||||
default:
|
||||
return errors.New(errors.CodeInvalidParam, "不支持的核销申请审批终态")
|
||||
}
|
||||
@@ -138,7 +145,7 @@ func (h *ApprovalDecisionHandler) applyApproved(
|
||||
})
|
||||
}
|
||||
|
||||
// applyClosed 处理最终驳回与渠道撤销、删除:释放全部预占并把申请置为对应终态。
|
||||
// applyClosed 处理最终驳回、渠道撤销、删除与审批提交失败:释放全部预占并把申请置为对应终态。
|
||||
func (h *ApprovalDecisionHandler) applyClosed(
|
||||
ctx context.Context,
|
||||
tx *gorm.DB,
|
||||
@@ -168,7 +175,8 @@ func (h *ApprovalDecisionHandler) applyClosed(
|
||||
}
|
||||
}
|
||||
terminalReason := ""
|
||||
if targetStatus == constants.EmployeeCollectionApplicationStatusRevoked {
|
||||
if targetStatus == constants.EmployeeCollectionApplicationStatusRevoked ||
|
||||
targetStatus == constants.EmployeeCollectionApplicationStatusSubmissionFailed {
|
||||
terminalReason = reason
|
||||
}
|
||||
result := tx.WithContext(ctx).Model(&model.EmployeeCollectionApplication{}).
|
||||
@@ -196,10 +204,14 @@ func (h *ApprovalDecisionHandler) applyClosed(
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
summary := "企业微信审批未通过,核销申请预占已释放"
|
||||
if targetStatus == constants.EmployeeCollectionApplicationStatusSubmissionFailed {
|
||||
summary = "审批提交失败,核销申请终止,预占已释放"
|
||||
}
|
||||
return h.audit.WriteEmployeeCollectionApplication(ctx, tx, ApplicationAudit{
|
||||
EventID: closedEventID,
|
||||
ActionCode: constants.AuditActionEmployeeCollectionApplicationRejected,
|
||||
Summary: "企业微信审批未通过,核销申请预占已释放",
|
||||
Summary: summary,
|
||||
Application: application, Attempt: attempt, Allocations: allocations, Bills: bills,
|
||||
BeforeData: map[string]any{"status": before},
|
||||
AfterData: applicationAuditSnapshot(application), CorrelationID: event.CorrelationID,
|
||||
@@ -495,6 +507,8 @@ func decisionEventSuffix(decision string) string {
|
||||
return "cancelled"
|
||||
case constants.ApprovalDecisionDeleted:
|
||||
return "deleted"
|
||||
case constants.ApprovalDecisionSubmissionFailed:
|
||||
return "submission_failed"
|
||||
default:
|
||||
return "closed"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user