feat(收口): 补齐 8 月迭代缺口并同步 Spec 与证据链
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
- 新增六对成对迁移 000232–000237:H5 弹窗类型、退款结算标识与申请人备注、优先轮询事实字段与两个新终态、通道阈值命中留痕、手机号最近解绑人、提现资格校验留痕 - 退款:原因必填与申请人备注、来源支付与渠道流水冻结、线下处理流水号补录审计、按订单查询可选退款方式、企微审批材料补齐且新增字段缺失映射即明确失败 - 优先轮询:人工关闭、有效期到期独立周期任务、失败与过期人工重触发、事实字段与异常重试查询、资产解析端点只读投影 - 通道阈值:命中事实同事务留痕与命中记录查询;员工账单:列表筛选与详情投影;商户池:列表投影与统计周期语义;H5:弹窗类型与类别排序 - 手机号:有效关联数量与最近解绑人、短信验证码失败次数限制;导出:佣金明细十五列与报表序号列 - 时间筛选:三处新增筛选纳入统一严格解析契约,员工账单产生时间参数改名 - 同步 12 份主 Spec 需求、两端点与异步任务证据链,门禁 context-health 与 OpenSpec 校验通过
This commit is contained in:
@@ -17,6 +17,7 @@ import (
|
||||
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/utils"
|
||||
)
|
||||
|
||||
// Query 优先轮询项只读查询。
|
||||
@@ -31,6 +32,7 @@ func NewQuery(db *gorm.DB, store *postgres.PollingPriorityItemStore) *Query {
|
||||
}
|
||||
|
||||
// List 分页查询优先轮询项,按创建时间倒序,并按当前账号数据范围下推。
|
||||
// 时间范围按入队时间(created_at)取闭区间,复用统一严格时间解析器;解析失败按参数非法返回。
|
||||
func (q *Query) List(ctx context.Context, req dto.PriorityPollingItemListRequest) (*dto.PriorityPollingItemListResponse, error) {
|
||||
if q == nil || q.store == nil {
|
||||
return nil, errors.New(errors.CodeInternalError, "优先轮询项查询未配置")
|
||||
@@ -39,11 +41,18 @@ func (q *Query) List(ctx context.Context, req dto.PriorityPollingItemListRequest
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
createdFrom, createdTo, err := utils.ParseTimeRange(req.StartTime, req.EndTime)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
filter := postgres.PollingPriorityItemListFilter{
|
||||
CardID: req.CardID,
|
||||
TaskType: req.TaskType,
|
||||
Status: req.Status,
|
||||
TriggerType: req.TriggerType,
|
||||
CreatedFrom: createdFrom,
|
||||
CreatedTo: createdTo,
|
||||
AbnormalOnly: req.AbnormalOnly != nil && *req.AbnormalOnly,
|
||||
ShopIDSnapshot: scope,
|
||||
Page: req.Page,
|
||||
PageSize: req.PageSize,
|
||||
@@ -158,35 +167,60 @@ func normalizePage(page, pageSize int) (int, int) {
|
||||
}
|
||||
|
||||
// toPriorityPollingItemResponse 把事实行投影为读侧 DTO,枚举按 constants 提供中文名称。
|
||||
// 有效期与「是否已过期」一律读事实状态,不按 next_run_at 现算:next_run_at 为空只表示未排期。
|
||||
func toPriorityPollingItemResponse(item *model.PollingPriorityItem, iccid string) *dto.PriorityPollingItemResponse {
|
||||
if item == nil {
|
||||
return nil
|
||||
}
|
||||
return &dto.PriorityPollingItemResponse{
|
||||
ID: item.ID,
|
||||
CardID: item.CardID,
|
||||
ICCID: iccid,
|
||||
TaskType: item.TaskType,
|
||||
TaskTypeName: constants.PollingPriorityTaskTypeName(item.TaskType),
|
||||
Status: item.Status,
|
||||
StatusName: constants.PollingPriorityStatusName(item.Status),
|
||||
TriggerType: item.TriggerType,
|
||||
TriggerTypeName: constants.PollingPriorityTriggerName(item.TriggerType),
|
||||
TriggerTypes: strings.Trim(item.TriggerTypes, ","),
|
||||
TriggerCount: item.TriggerCount,
|
||||
LastTriggeredAt: item.LastTriggeredAt,
|
||||
SourceOrderID: item.SourceOrderID,
|
||||
SourcePackageUse: item.SourcePackageUsageID,
|
||||
AttemptCount: item.AttemptCount,
|
||||
ClaimedAt: item.ClaimedAt,
|
||||
ManualReason: item.ManualReason,
|
||||
ManualOperator: item.ManualOperatorID,
|
||||
ManualOperatorNm: item.ManualOperatorName,
|
||||
ShopIDSnapshot: item.ShopIDSnapshot,
|
||||
Result: item.Result,
|
||||
ResultName: constants.PollingPriorityResultName(item.Result),
|
||||
FailureReason: item.FailureReason,
|
||||
CreatedAt: item.CreatedAt,
|
||||
UpdatedAt: item.UpdatedAt,
|
||||
ID: item.ID,
|
||||
CardID: item.CardID,
|
||||
ICCID: iccid,
|
||||
AssetType: item.AssetType,
|
||||
AssetID: item.AssetID,
|
||||
DeviceNo: item.DeviceNoSnapshot,
|
||||
TaskType: item.TaskType,
|
||||
TaskTypeName: constants.PollingPriorityTaskTypeName(item.TaskType),
|
||||
Status: item.Status,
|
||||
StatusName: constants.PollingPriorityStatusName(item.Status),
|
||||
TriggerType: item.TriggerType,
|
||||
TriggerTypeName: constants.PollingPriorityTriggerName(item.TriggerType),
|
||||
TriggerTypes: strings.Trim(item.TriggerTypes, ","),
|
||||
TriggerCount: item.TriggerCount,
|
||||
LastTriggeredAt: item.LastTriggeredAt,
|
||||
SourceOrderID: item.SourceOrderID,
|
||||
SourcePackageUse: item.SourcePackageUsageID,
|
||||
AttemptCount: item.AttemptCount,
|
||||
AttemptLimit: item.AttemptLimit,
|
||||
ClaimedAt: item.ClaimedAt,
|
||||
StartedAt: item.StartedAt,
|
||||
FinishedAt: item.FinishedAt,
|
||||
DurationMS: pollingPriorityDurationMS(item),
|
||||
NextRunAt: item.NextRunAt,
|
||||
PriorityEffectiveFrom: item.PriorityEffectiveFrom,
|
||||
DequeuedAt: item.DequeuedAt,
|
||||
ManualReason: item.ManualReason,
|
||||
ManualOperator: item.ManualOperatorID,
|
||||
ManualOperatorNm: item.ManualOperatorName,
|
||||
ShopIDSnapshot: item.ShopIDSnapshot,
|
||||
AgentShopID: item.AgentShopIDSnapshot,
|
||||
Result: item.Result,
|
||||
ResultName: constants.PollingPriorityResultName(item.Result),
|
||||
FailureReason: item.FailureReason,
|
||||
IntegrationLogID: item.IntegrationLogID,
|
||||
CreatedAt: item.CreatedAt,
|
||||
UpdatedAt: item.UpdatedAt,
|
||||
}
|
||||
}
|
||||
|
||||
// pollingPriorityDurationMS 返回最近一次执行的耗时毫秒数。
|
||||
// 只有开始与结束时间都在时才有耗时;结束早于开始等异常数据按 0 处理,不返回负数。
|
||||
func pollingPriorityDurationMS(item *model.PollingPriorityItem) int64 {
|
||||
if item == nil || item.StartedAt == nil || item.FinishedAt == nil {
|
||||
return 0
|
||||
}
|
||||
if item.FinishedAt.Before(*item.StartedAt) {
|
||||
return 0
|
||||
}
|
||||
return item.FinishedAt.Sub(*item.StartedAt).Milliseconds()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user