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 变更、无迁移、无运行时开关。
191 lines
6.0 KiB
Go
191 lines
6.0 KiB
Go
package exporter
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"gorm.io/gorm"
|
|
|
|
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
|
)
|
|
|
|
// ExchangeDataSource 换货记录导出数据源。
|
|
type ExchangeDataSource struct {
|
|
db *gorm.DB
|
|
}
|
|
|
|
// NewExchangeDataSource 创建换货记录导出数据源。
|
|
func NewExchangeDataSource(db *gorm.DB) *ExchangeDataSource {
|
|
return &ExchangeDataSource{db: db}
|
|
}
|
|
|
|
// Scene 返回导出场景编码。
|
|
func (s *ExchangeDataSource) Scene() string {
|
|
return constants.ExportTaskSceneExchange
|
|
}
|
|
|
|
// Count 统计换货记录导出行数。
|
|
func (s *ExchangeDataSource) Count(ctx context.Context, params ExportParams) (int, error) {
|
|
var total int64
|
|
query, err := s.applyFilters(s.baseQuery(ctx), params)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
if err := query.Count(&total).Error; err != nil {
|
|
return 0, err
|
|
}
|
|
return int(total), nil
|
|
}
|
|
|
|
// Headers 返回换货记录导出表头。
|
|
func (s *ExchangeDataSource) Headers(context.Context, ExportParams) ([]string, error) {
|
|
return []string{
|
|
"换货单号", "换货类型", "换货原因", "问题描述/备注", "旧资产类型", "旧资产标识符", "新资产标识符",
|
|
"收货人姓名", "收货人电话", "收货地址", "快递公司", "快递单号", "状态", "迁移状态", "创建人", "创建时间",
|
|
}, nil
|
|
}
|
|
|
|
// Fetch 按 offset/limit 查询换货记录导出数据。
|
|
func (s *ExchangeDataSource) Fetch(ctx context.Context, params ExportParams, offset, limit int) ([][]string, error) {
|
|
if limit <= 0 {
|
|
return [][]string{}, nil
|
|
}
|
|
|
|
var items []exchangeExportRow
|
|
filtered, err := s.applyFilters(s.baseQuery(ctx), params)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
query := filtered.
|
|
Select(`
|
|
e.exchange_no,
|
|
e.flow_type,
|
|
e.exchange_reason,
|
|
COALESCE(e.remark, '') AS remark,
|
|
e.old_asset_type,
|
|
e.old_asset_identifier,
|
|
e.new_asset_identifier,
|
|
e.recipient_name,
|
|
e.recipient_phone,
|
|
e.recipient_address,
|
|
e.express_company,
|
|
e.express_no,
|
|
e.status,
|
|
e.migration_status,
|
|
e.created_at,
|
|
COALESCE(ac.username, '') AS creator_name
|
|
`).
|
|
Joins("LEFT JOIN tb_account AS ac ON ac.id = e.creator").
|
|
Order("e.id ASC").
|
|
Limit(limit).
|
|
Offset(offset)
|
|
if err := query.Scan(&items).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
rows := make([][]string, 0, len(items))
|
|
for _, item := range items {
|
|
rows = append(rows, []string{
|
|
item.ExchangeNo,
|
|
constants.GetExchangeFlowTypeName(item.FlowType),
|
|
item.ExchangeReason,
|
|
item.Remark,
|
|
formatExchangeAssetType(item.OldAssetType),
|
|
item.OldAssetIdentifier,
|
|
item.NewAssetIdentifier,
|
|
item.RecipientName,
|
|
item.RecipientPhone,
|
|
item.RecipientAddress,
|
|
item.ExpressCompany,
|
|
item.ExpressNo,
|
|
constants.GetExchangeStatusName(item.Status),
|
|
constants.GetExchangeMigrationStatusName(item.MigrationStatus),
|
|
item.CreatorName,
|
|
item.CreatedAt.Format(exportTimeLayout),
|
|
})
|
|
}
|
|
return rows, nil
|
|
}
|
|
|
|
func (s *ExchangeDataSource) baseQuery(ctx context.Context) *gorm.DB {
|
|
return s.db.WithContext(ctx).Table("tb_exchange_order AS e").Where("e.deleted_at IS NULL")
|
|
}
|
|
|
|
func (s *ExchangeDataSource) applyFilters(query *gorm.DB, params ExportParams) (*gorm.DB, error) {
|
|
query = applyExportShopScope(query, params, "e.shop_id")
|
|
if status, ok := filterInt(params.Filters, "status"); ok {
|
|
query = query.Where("e.status = ?", status)
|
|
}
|
|
if flowType, ok := filterString(params.Filters, "flow_type"); ok {
|
|
query = query.Where("COALESCE(NULLIF(e.flow_type, ''), ?) = ?", constants.ExchangeFlowTypeShipping, flowType)
|
|
}
|
|
query = applyExchangeAssetKeyword(query, "old", filterValue(params.Filters, "old_asset_keyword"))
|
|
query = applyExchangeAssetKeyword(query, "new", filterValue(params.Filters, "new_asset_keyword"))
|
|
start, end, err := strictTimeRange(params.Filters)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if start != nil {
|
|
query = query.Where("e.created_at >= ?", *start)
|
|
}
|
|
if end != nil {
|
|
query = query.Where("e.created_at <= ?", *end)
|
|
}
|
|
return query, nil
|
|
}
|
|
|
|
func applyExchangeAssetKeyword(query *gorm.DB, side, keyword string) *gorm.DB {
|
|
if keyword == "" {
|
|
return query
|
|
}
|
|
like := "%" + keyword + "%"
|
|
cardIDs := query.Session(&gorm.Session{NewDB: true}).Table("tb_iot_card").Select("id").
|
|
Where("deleted_at IS NULL").
|
|
Where("iccid LIKE ? OR msisdn LIKE ? OR virtual_no LIKE ?", like, like, like)
|
|
deviceIDs := query.Session(&gorm.Session{NewDB: true}).Table("tb_device").Select("id").
|
|
Where("deleted_at IS NULL").
|
|
Where("virtual_no LIKE ? OR imei LIKE ? OR sn LIKE ?", like, like, like)
|
|
prefix := "e." + 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,
|
|
)
|
|
}
|
|
|
|
func filterValue(filters map[string]any, key string) string {
|
|
value, _ := filterString(filters, key)
|
|
return value
|
|
}
|
|
|
|
func formatExchangeAssetType(assetType string) string {
|
|
switch assetType {
|
|
case constants.ExchangeAssetTypeIotCard:
|
|
return "物联网卡"
|
|
case constants.ExchangeAssetTypeDevice:
|
|
return "设备"
|
|
case "":
|
|
return ""
|
|
default:
|
|
return "未知"
|
|
}
|
|
}
|
|
|
|
type exchangeExportRow struct {
|
|
ExchangeNo string `gorm:"column:exchange_no"`
|
|
FlowType string `gorm:"column:flow_type"`
|
|
ExchangeReason string `gorm:"column:exchange_reason"`
|
|
Remark string `gorm:"column:remark"`
|
|
OldAssetType string `gorm:"column:old_asset_type"`
|
|
OldAssetIdentifier string `gorm:"column:old_asset_identifier"`
|
|
NewAssetIdentifier string `gorm:"column:new_asset_identifier"`
|
|
RecipientName string `gorm:"column:recipient_name"`
|
|
RecipientPhone string `gorm:"column:recipient_phone"`
|
|
RecipientAddress string `gorm:"column:recipient_address"`
|
|
ExpressCompany string `gorm:"column:express_company"`
|
|
ExpressNo string `gorm:"column:express_no"`
|
|
Status int `gorm:"column:status"`
|
|
MigrationStatus string `gorm:"column:migration_status"`
|
|
CreatorName string `gorm:"column:creator_name"`
|
|
CreatedAt time.Time `gorm:"column:created_at"`
|
|
}
|