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:
@@ -103,17 +103,11 @@ func (s *RecoveryService) Execute(ctx context.Context, refundID uint) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if instance.Status != constants.ApprovalStatusSubmissionFailed || context.SubmissionStatus != constants.WeComSubmissionStatusFailed {
|
||||
return errors.New(errors.CodeConflict, "当前审批提交状态不允许恢复")
|
||||
if instance.Status == constants.ApprovalStatusSubmissionFailed && context.SubmissionStatus == constants.WeComSubmissionStatusFailed {
|
||||
// 提交失败已由决策终止退款单,不再重放;须在卡管重新发起。
|
||||
return errors.New(errors.CodeConflict, constants.ApprovalSubmissionFailedNotRecoverableMessage)
|
||||
}
|
||||
branch = "replay"
|
||||
if s.audit != nil {
|
||||
if err := s.audit.WriteRecoveryRequest(ctx, tx, &instance, actorID, branch); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
_, err = s.recovery.RecoverSubmissionEvent(ctx, tx, instance.ID)
|
||||
return err
|
||||
return errors.New(errors.CodeConflict, "当前审批提交状态不允许恢复")
|
||||
})
|
||||
}
|
||||
func fillMissingSnapshot(instance *model.ApprovalInstance, attempt *model.RefundRequestAttempt) ([]string, error) {
|
||||
|
||||
Reference in New Issue
Block a user