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:
@@ -47,6 +47,9 @@ func (q *ApplicationQuery) List(
|
||||
for index := range applications {
|
||||
list = append(list, ProjectApplication(&applications[index]))
|
||||
}
|
||||
if err := q.fillApplicationSubmission(ctx, list); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &dto.EmployeeCollectionApplicationListResponse{
|
||||
List: list, Total: total, Page: page, PageSize: pageSize,
|
||||
}, nil
|
||||
@@ -77,8 +80,12 @@ func (q *ApplicationQuery) Detail(ctx context.Context, id uint) (*dto.EmployeeCo
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
projected := ProjectApplication(&application)
|
||||
if err := q.fillApplicationSubmission(ctx, []*dto.EmployeeCollectionApplicationResponse{projected}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &dto.EmployeeCollectionApplicationDetailResponse{
|
||||
Application: ProjectApplication(&application), Allocations: allocations, Attempts: attempts,
|
||||
Application: projected, Allocations: allocations, Attempts: attempts,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -105,7 +112,8 @@ func (q *ApplicationQuery) applyApplicationScope(
|
||||
case constants.EmployeeCollectionApplicationStatusPending,
|
||||
constants.EmployeeCollectionApplicationStatusApproved,
|
||||
constants.EmployeeCollectionApplicationStatusRejected,
|
||||
constants.EmployeeCollectionApplicationStatusRevoked:
|
||||
constants.EmployeeCollectionApplicationStatusRevoked,
|
||||
constants.EmployeeCollectionApplicationStatusSubmissionFailed:
|
||||
query = query.Where("status = ?", *request.Status)
|
||||
default:
|
||||
return nil, errors.New(errors.CodeInvalidParam, "不支持的核销申请状态")
|
||||
|
||||
Reference in New Issue
Block a user