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:
邹进
2026-10-12 00:03:46 +09:00
parent 25c081fe60
commit 6298a9061f
42 changed files with 810 additions and 87 deletions

View File

@@ -7,6 +7,8 @@ const (
AgentDistributionRegistrationStatusApproved = 1
// AgentDistributionRegistrationStatusRejected 表示注册记录已驳回,未创建任何实体。
AgentDistributionRegistrationStatusRejected = 2
// AgentDistributionRegistrationStatusSubmissionFailed 表示提交企业微信审批被明确拒绝,注册终止且未创建任何实体。
AgentDistributionRegistrationStatusSubmissionFailed = 3
)
const (
@@ -23,6 +25,8 @@ func GetAgentDistributionRegistrationStatusName(status int) string {
return "已通过"
case AgentDistributionRegistrationStatusRejected:
return "已驳回"
case AgentDistributionRegistrationStatusSubmissionFailed:
return ApprovalSubmissionFailedStatusName
default:
return "未知"
}

View File

@@ -228,6 +228,15 @@ const (
ApprovalDecisionDeleted = "deleted"
// ApprovalDecisionRevokedAfterApproved 表示标准审批通过后撤销决策。
ApprovalDecisionRevokedAfterApproved = "revoked_after_approved"
// ApprovalDecisionSubmissionFailed 表示审批提交被企业微信明确拒绝(实例进入提交失败),由审批核心在同一事务内发出。
// 该值只在终态决策消费入口放行,渠道回调状态推进不接受此值。
ApprovalDecisionSubmissionFailed = "submission_failed"
// ApprovalSubmissionFailedStatusName 各业务“审批提交失败”终态的统一中文名称。
ApprovalSubmissionFailedStatusName = "审批提交失败"
// ApprovalSubmissionFailedReason 提交失败对外展示的脱敏原因,不透传企微原文。
ApprovalSubmissionFailedReason = "审批提交失败,请检查审批模板与渠道状态"
// ApprovalSubmissionFailedNotRecoverableMessage 恢复入口拒绝重放提交失败审批时的提示。
ApprovalSubmissionFailedNotRecoverableMessage = "审批提交失败为终态,请重新发起"
)
const (
@@ -285,6 +294,8 @@ const (
ApprovalSyncSourcePolling = "polling"
// ApprovalSyncSourceManual 表示由受控人工动作触发权威同步。
ApprovalSyncSourceManual = "manual"
// ApprovalSyncSourceSubmission 表示由审批提交 Worker 在提交被明确拒绝时发出决策。
ApprovalSyncSourceSubmission = "submission"
)
// GetApprovalStatusName 返回通用审批状态的中文名称。

View File

@@ -31,6 +31,8 @@ const (
EmployeeCollectionApplicationStatusRejected = 2
// EmployeeCollectionApplicationStatusRevoked 表示核销申请通过后撤销等异常终态或已关闭。
EmployeeCollectionApplicationStatusRevoked = 3
// EmployeeCollectionApplicationStatusSubmissionFailed 表示提交企业微信审批被明确拒绝,申请终止并释放预占。
EmployeeCollectionApplicationStatusSubmissionFailed = 4
)
// 核销分摊状态,取值与 tb_employee_collection_application_allocation.status 检查约束一致。
@@ -118,6 +120,8 @@ func GetEmployeeCollectionApplicationStatusName(status int) string {
return "已驳回"
case EmployeeCollectionApplicationStatusRevoked:
return "已撤销或已关闭"
case EmployeeCollectionApplicationStatusSubmissionFailed:
return ApprovalSubmissionFailedStatusName
default:
return "未知状态"
}

View File

@@ -248,6 +248,8 @@ const (
WithdrawalStatusApproved = 2 // 已通过
WithdrawalStatusRejected = 3 // 已拒绝
WithdrawalStatusPaid = 4 // 已到账
// WithdrawalStatusSubmissionFailed 提交企业微信审批被明确拒绝,提现终止并释放冻结金额。
WithdrawalStatusSubmissionFailed = 5
)
// 提现方式
@@ -416,7 +418,7 @@ func GetOrderCommissionResultName(result int) string {
}
// GetRefundStatusName 获取退款申请状态名称
// 1=待审批, 2=已通过, 3=已拒绝, 4=已退回, 5=原路退款处理中, 6=原路退款失败
// 1=待审批, 2=已通过, 3=已拒绝, 4=已退回, 5=原路退款处理中, 6=原路退款失败, 7=审批提交失败
func GetRefundStatusName(status int) string {
switch status {
case 1:
@@ -431,13 +433,15 @@ func GetRefundStatusName(status int) string {
return "原路退款处理中"
case 6:
return "原路退款失败"
case 7:
return ApprovalSubmissionFailedStatusName
default:
return "未知"
}
}
// GetWithdrawalStatusName 获取提现申请状态名称
// 对应 WithdrawalStatus* 常量:1=待审核, 2=已通过, 3=已拒绝, 4=已到账
// 对应 WithdrawalStatus* 常量:1=待审核, 2=已通过, 3=已拒绝, 4=已到账, 5=审批提交失败
func GetWithdrawalStatusName(status int) string {
switch status {
case WithdrawalStatusPending:
@@ -448,6 +452,8 @@ func GetWithdrawalStatusName(status int) string {
return "已拒绝"
case WithdrawalStatusPaid:
return "已到账"
case WithdrawalStatusSubmissionFailed:
return ApprovalSubmissionFailedStatusName
default:
return "未知"
}

View File

@@ -136,6 +136,8 @@ const (
RechargeStatusClosed = 4 // 已关闭
RechargeStatusRefunded = 5 // 已退款
RechargeStatusRejected = 6 // 已驳回
// RechargeStatusSubmissionFailed 线下代理充值提交企业微信审批被明确拒绝,充值终止且不入账。
RechargeStatusSubmissionFailed = 7
)
// 充值支付方式
@@ -161,7 +163,7 @@ const (
// ========== Redis Key 生成函数 ==========
// GetRechargeStatusName 获取充值状态名称
// 对应 RechargeStatus* 常量:1=待支付, 2=已支付, 3=已完成, 4=已关闭, 5=已退款, 6=已驳回
// 对应 RechargeStatus* 常量:1=待支付, 2=已支付, 3=已完成, 4=已关闭, 5=已退款, 6=已驳回, 7=审批提交失败
func GetRechargeStatusName(status int) string {
switch status {
case RechargeStatusPending:
@@ -176,6 +178,8 @@ func GetRechargeStatusName(status int) string {
return "已退款"
case RechargeStatusRejected:
return "已驳回"
case RechargeStatusSubmissionFailed:
return ApprovalSubmissionFailedStatusName
default:
return "未知"
}

View File

@@ -16,6 +16,8 @@ const (
WithdrawalQualificationStatusRejected = 2
// WithdrawalQualificationStatusInvalidated 表示资料版本已失效或已被超级管理员作废。
WithdrawalQualificationStatusInvalidated = 3
// WithdrawalQualificationStatusSubmissionFailed 表示资料版本提交企业微信审批被明确拒绝,该版本终止。
WithdrawalQualificationStatusSubmissionFailed = 4
)
// WithdrawalQualificationCheckPassed 表示本次提现资料资格校验通过。
@@ -66,6 +68,8 @@ func GetWithdrawalQualificationStatusName(status int) string {
return "已驳回"
case WithdrawalQualificationStatusInvalidated:
return "已失效"
case WithdrawalQualificationStatusSubmissionFailed:
return ApprovalSubmissionFailedStatusName
default:
return "未知"
}