All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 13m40s
统一时间筛选:新增共享严格解析器 pkg/utils/time_range.go,只接受带显式时区的 RFC3339 秒级时间(拒绝小数秒、无时区、date-only、空格分隔、±hhmm、未补零、非法日期与越界偏移),闭区间含两端、归一为 UTC 瞬时,创建期与执行期共用同一份实现。 端点改造(13 个入口):IoT 卡导入任务、设备导入任务、导出任务列表、订单列表参数名不变仅收紧解析;换货、分配记录、代理充值、临期列表改名 start_time/end_time(旧参数名显式拒绝);提现记录两处删除解析失败静默跳过,非法参数一律 1001;授权记录由起始闭结束开改为闭区间含两端;临期列表改按当前生效主套餐最终到期时刻比较,保留剩余天数上下限与既有粗放窗口。 临期导出新建:新场景 expiring_asset 与受控入口 POST /api/admin/expiring-assets/export,复用列表候选预筛与最终到期推算,一行一资产、加油包不单独成行,列序与 111 §18.1 逐列一致,店铺/业务员/用户组按执行时当前归属补充且不超出创建时冻结范围。 佣金明细导出新增按创建时间闭区间筛选(原佣金与回溯两条分支各自创建时间列),记录粒度、列定义与余额口径不变。 冻结与遗留任务:创建期把筛选与时间边界规范化为 UTC RFC3339 秒级串写入既有 query_json,无新列无迁移;执行期只按冻结值严格解析,非法冻结值在任何分片与文件动作前落任务失败并写安全摘要,不放行全量;重试沿用原快照。达量预警导出执行期同样纳入严格解析(其入口契约、列定义与触发快照口径不变)。 归档 add-export-time-filter-standards 并新建主 Spec openspec/specs/export-time-filter/spec.md,同步 requirement-evidence.json 与入口能力矩阵,README 导出场景清单更新为 11 个场景。 验证:junhong_cmp_test + 本地隔离 Redis(DB7,测试部署共享队列 DB6 未被占用)实跑 85 PASS / 0 FAIL(接受/拒绝集合、区间与顺序语义、列表与导出同筛选行集一致、代理 HTTP 全链路与范围冻结、遗留旧格式任务安全失败、列与余额口径回归、表头逐字),门禁 gofmt/go build/gendocs 两次一致/openspec validate/doctor/context-health 全绿;无 Schema 变更、无迁移、无运行时开关。
158 lines
6.2 KiB
Go
158 lines
6.2 KiB
Go
// Package exchange 提供换货读取用例。
|
|
package exchange
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/break/junhong_cmp_fiber/internal/model"
|
|
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
|
"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/middleware"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
// ListQuery 查询换货列表并完成权限、分页和响应投影。
|
|
type ListQuery struct {
|
|
db *gorm.DB
|
|
}
|
|
|
|
type assetSide string
|
|
|
|
const (
|
|
// oldAssetSide 表示旧资产查询侧。
|
|
oldAssetSide assetSide = "old"
|
|
// newAssetSide 表示新资产查询侧。
|
|
newAssetSide assetSide = "new"
|
|
)
|
|
|
|
// NewListQuery 创建换货列表查询。
|
|
func NewListQuery(db *gorm.DB) *ListQuery {
|
|
return &ListQuery{db: db}
|
|
}
|
|
|
|
// List 按新旧资产关键词和其他列表条件查询换货单。
|
|
func (q *ListQuery) List(ctx context.Context, req *dto.ExchangeListRequest, startTime, endTime *time.Time) (*dto.ExchangeListResponse, error) {
|
|
page := constants.DefaultPage
|
|
if req.Page != nil {
|
|
page = *req.Page
|
|
}
|
|
pageSize := constants.DefaultPageSize
|
|
if req.PageSize != nil {
|
|
pageSize = *req.PageSize
|
|
}
|
|
|
|
query := q.db.WithContext(ctx).Model(&model.ExchangeOrder{})
|
|
query = middleware.ApplyShopFilter(ctx, query)
|
|
query = applyListFilters(query, req, startTime, endTime)
|
|
|
|
var total int64
|
|
if err := query.Count(&total).Error; err != nil {
|
|
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询换货单数量失败")
|
|
}
|
|
|
|
var orders []*model.ExchangeOrder
|
|
offset := (page - 1) * pageSize
|
|
if err := query.Order("created_at DESC").Offset(offset).Limit(pageSize).Find(&orders).Error; err != nil {
|
|
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询换货单列表失败")
|
|
}
|
|
submitterIDs := make([]uint, 0, len(orders))
|
|
for _, order := range orders {
|
|
if order.Creator > 0 {
|
|
submitterIDs = append(submitterIDs, order.Creator)
|
|
}
|
|
}
|
|
accounts, err := postgres.NewAccountStore(q.db, nil).GetDisplayAccountsByIDs(ctx, submitterIDs)
|
|
if err != nil {
|
|
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询换货提交人失败")
|
|
}
|
|
submitterNames := make(map[uint]string, len(accounts))
|
|
for _, account := range accounts {
|
|
submitterNames[account.ID] = account.Username
|
|
}
|
|
|
|
items := make([]*dto.ExchangeOrderResponse, 0, len(orders))
|
|
for _, order := range orders {
|
|
item := projectExchangeOrder(order)
|
|
item.SubmitterName = submitterNames[order.Creator]
|
|
items = append(items, item)
|
|
}
|
|
return &dto.ExchangeListResponse{List: items, Total: total, Page: page, PageSize: pageSize}, nil
|
|
}
|
|
|
|
// applyListFilters 组装列表计数和数据查询共用的全部过滤条件。
|
|
func applyListFilters(query *gorm.DB, req *dto.ExchangeListRequest, startTime, endTime *time.Time) *gorm.DB {
|
|
if req.Status != nil {
|
|
query = query.Where("status = ?", *req.Status)
|
|
}
|
|
if req.FlowType != "" {
|
|
query = query.Where("COALESCE(NULLIF(flow_type, ''), ?) = ?", constants.ExchangeFlowTypeShipping, req.FlowType)
|
|
}
|
|
query = applyAssetKeyword(query, oldAssetSide, req.OldAssetKeyword)
|
|
query = applyAssetKeyword(query, newAssetSide, req.NewAssetKeyword)
|
|
if startTime != nil {
|
|
query = query.Where("created_at >= ?", *startTime)
|
|
}
|
|
if endTime != nil {
|
|
query = query.Where("created_at <= ?", *endTime)
|
|
}
|
|
return query
|
|
}
|
|
|
|
// applyAssetKeyword 使用子查询按资产类型和主键命中,避免依赖历史快照内容或逐行读取资产。
|
|
func applyAssetKeyword(query *gorm.DB, side assetSide, keyword string) *gorm.DB {
|
|
if keyword == "" {
|
|
return query
|
|
}
|
|
like := "%" + keyword + "%"
|
|
cardIDs := query.Session(&gorm.Session{NewDB: true}).Model(&model.IotCard{}).
|
|
Select("id").
|
|
Where("iccid LIKE ? OR msisdn LIKE ? OR virtual_no LIKE ?", like, like, like)
|
|
deviceIDs := query.Session(&gorm.Session{NewDB: true}).Model(&model.Device{}).
|
|
Select("id").
|
|
Where("virtual_no LIKE ? OR imei LIKE ? OR sn LIKE ?", like, like, like)
|
|
prefix := string(side)
|
|
return query.Where(
|
|
"("+prefix+"_asset_type = ? AND "+prefix+"_asset_id IN (?)) OR ("+prefix+"_asset_type = ? AND "+prefix+"_asset_id IN (?))",
|
|
constants.ExchangeAssetTypeIotCard, cardIDs, constants.ExchangeAssetTypeDevice, deviceIDs,
|
|
)
|
|
}
|
|
|
|
// projectExchangeOrder 将只读模型投影为列表响应,不用于后续写侧判断。
|
|
func projectExchangeOrder(order *model.ExchangeOrder) *dto.ExchangeOrderResponse {
|
|
var deletedAt *time.Time
|
|
if order.DeletedAt.Valid {
|
|
deletedAt = &order.DeletedAt.Time
|
|
}
|
|
// 失败原因只在迁移失败时对外可见,其他状态一律不返回,避免把历史原因误读为当前状态。
|
|
failureReason := ""
|
|
if order.MigrationStatus == constants.ExchangeMigrationStatusFailed {
|
|
failureReason = order.MigrationFailureReason
|
|
}
|
|
return &dto.ExchangeOrderResponse{
|
|
ID: order.ID, ExchangeNo: order.ExchangeNo,
|
|
FlowType: effectiveFlowType(order.FlowType), FlowTypeName: constants.GetExchangeFlowTypeName(order.FlowType),
|
|
OldAssetType: order.OldAssetType, OldAssetID: order.OldAssetID, OldAssetIdentifier: order.OldAssetIdentifier,
|
|
NewAssetType: order.NewAssetType, NewAssetID: order.NewAssetID, NewAssetIdentifier: order.NewAssetIdentifier,
|
|
RecipientName: order.RecipientName, RecipientPhone: order.RecipientPhone, RecipientAddress: order.RecipientAddress,
|
|
ExpressCompany: order.ExpressCompany, ExpressNo: order.ExpressNo,
|
|
MigrateData: order.MigrateData, MigrationCompleted: order.MigrationCompleted, MigrationBalance: order.MigrationBalance,
|
|
MigrationStatus: order.MigrationStatus, MigrationStatusName: constants.GetExchangeMigrationStatusName(order.MigrationStatus),
|
|
MigrationFailureReason: failureReason,
|
|
ShippedAt: order.ShippedAt, CompletedAt: order.CompletedAt,
|
|
ExchangeReason: order.ExchangeReason, Remark: order.Remark,
|
|
Status: order.Status, StatusName: constants.GetExchangeStatusName(order.Status), StatusText: constants.GetExchangeStatusName(order.Status),
|
|
ShopID: order.ShopID, CreatedAt: order.CreatedAt, UpdatedAt: order.UpdatedAt, DeletedAt: deletedAt,
|
|
SubmitterID: order.Creator, Creator: order.Creator, Updater: order.Updater,
|
|
}
|
|
}
|
|
|
|
func effectiveFlowType(flowType string) string {
|
|
if flowType == "" {
|
|
return constants.ExchangeFlowTypeShipping
|
|
}
|
|
return flowType
|
|
}
|