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:
@@ -146,7 +146,7 @@ type EmployeeCollectionBillRefundResponse struct {
|
||||
type EmployeeCollectionBillAllocationResponse struct {
|
||||
ID uint `json:"id" description:"分摊ID"`
|
||||
ApplicationID uint `json:"application_id" description:"核销申请ID"`
|
||||
ApplicationStatus int `json:"application_status" description:"申请状态 (0:审批中, 1:已通过, 2:已驳回, 3:已撤销或已关闭)"`
|
||||
ApplicationStatus int `json:"application_status" description:"申请状态 (0:审批中, 1:已通过, 2:已驳回, 3:已撤销或已关闭, 4:审批提交失败)"`
|
||||
ApplicationStatusName string `json:"application_status_name" description:"申请状态中文名称"`
|
||||
AttemptID uint `json:"attempt_id" description:"所属审批尝试记录ID"`
|
||||
Amount int64 `json:"amount" description:"本次分摊金额(分)"`
|
||||
@@ -194,7 +194,7 @@ type EmployeeCollectionBillApplicationResponse struct {
|
||||
ExternalTransactionNo string `json:"external_transaction_no" description:"外部交易流水号"`
|
||||
PaymentVoucherKeys []string `json:"payment_voucher_keys" description:"支付凭证对象存储Key列表,仅返回对象键引用"`
|
||||
Remark string `json:"remark" description:"申请备注"`
|
||||
Status int `json:"status" description:"申请状态 (0:审批中, 1:已通过, 2:已驳回, 3:已撤销或已关闭)"`
|
||||
Status int `json:"status" description:"申请状态 (0:审批中, 1:已通过, 2:已驳回, 3:已撤销或已关闭, 4:审批提交失败)"`
|
||||
StatusName string `json:"status_name" description:"申请状态中文名称"`
|
||||
LatestApprovalInstanceID uint `json:"latest_approval_instance_id" description:"最新通用审批实例ID,仅用于展示"`
|
||||
DecidedAt *time.Time `json:"decided_at,omitempty" description:"审批终态到达时间"`
|
||||
@@ -267,7 +267,7 @@ type SubmitEmployeeCollectionApplicationRequest struct {
|
||||
type EmployeeCollectionApplicationListRequest struct {
|
||||
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码,默认1"`
|
||||
PageSize int `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页条数,默认20,最大100"`
|
||||
Status *int `json:"status" query:"status" validate:"omitempty,oneof=0 1 2 3" enum:"0,1,2,3" description:"按申请状态过滤 (0:审批中, 1:已通过, 2:已驳回, 3:已撤销或已关闭)"`
|
||||
Status *int `json:"status" query:"status" validate:"omitempty,oneof=0 1 2 3 4" enum:"0,1,2,3,4" description:"按申请状态过滤 (0:审批中, 1:已通过, 2:已驳回, 3:已撤销或已关闭, 4:审批提交失败)"`
|
||||
ApplicantAccountID *uint `json:"applicant_account_id" query:"applicant_account_id" description:"按申请人账号ID过滤;非超级管理员固定为当前账号,该参数被忽略"`
|
||||
PaymentMethodID *uint `json:"payment_method_id" query:"payment_method_id" description:"按线下收款方式字典ID过滤"`
|
||||
CreatedFrom *string `json:"created_from" query:"created_from" description:"创建时间起始(YYYY-MM-DD,含当日 00:00:00)"`
|
||||
@@ -289,11 +289,11 @@ type EmployeeCollectionApplicationResponse struct {
|
||||
ExternalTransactionNo string `json:"external_transaction_no" description:"人工确认的外部交易流水号,申请人可原样核对与重用"`
|
||||
PaymentVoucherKeys []string `json:"payment_voucher_keys" description:"支付凭证对象存储Key列表,仅返回对象键引用"`
|
||||
Remark string `json:"remark" description:"申请备注"`
|
||||
Status int `json:"status" description:"申请状态 (0:审批中, 1:已通过, 2:已驳回, 3:已撤销或已关闭)"`
|
||||
Status int `json:"status" description:"申请状态 (0:审批中, 1:已通过, 2:已驳回, 3:已撤销或已关闭, 4:审批提交失败)"`
|
||||
StatusName string `json:"status_name" description:"申请状态中文名称"`
|
||||
LatestAttemptID uint `json:"latest_attempt_id" description:"最新审批尝试记录ID,仅用于展示"`
|
||||
LatestApprovalInstanceID uint `json:"latest_approval_instance_id" description:"最新通用审批实例ID,仅用于展示"`
|
||||
ApprovalSubmissionStatus int `json:"approval_submission_status" description:"审批提交状态"`
|
||||
ApprovalSubmissionStatus int `json:"approval_submission_status" description:"最新审批实例的企业微信提交状态 (0:待提交, 1:提交中, 2:已提交, 3:提交失败, 4:结果未知);无审批上下文为 0"`
|
||||
ApprovalSubmissionName string `json:"approval_submission_name" description:"审批提交状态中文名称"`
|
||||
ApprovalFailureSummary string `json:"approval_failure_summary,omitempty" description:"脱敏审批失败摘要"`
|
||||
Recoverable bool `json:"recoverable" description:"是否允许恢复原审批"`
|
||||
|
||||
Reference in New Issue
Block a user