feat(导出时间筛选): AUG26-014 统一时间筛选与临期导出,归档并同步主 Spec 与证据链
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 变更、无迁移、无运行时开关。
This commit is contained in:
2026-09-17 18:37:02 +08:00
parent e8ab1f471e
commit 62419d4b17
67 changed files with 2405 additions and 398 deletions

View File

@@ -501,7 +501,7 @@ func (s *Service) GetByID(ctx context.Context, id uint) (*dto.AgentRechargeRespo
// List 分页查询充值订单列表
// GET /api/admin/agent-recharges
func (s *Service) List(ctx context.Context, req *dto.AgentRechargeListRequest) ([]*dto.AgentRechargeResponse, int64, error) {
func (s *Service) List(ctx context.Context, req *dto.AgentRechargeListRequest, startTime, endTime *time.Time) ([]*dto.AgentRechargeResponse, int64, error) {
page := req.Page
pageSize := req.PageSize
if page == 0 {
@@ -525,11 +525,11 @@ func (s *Service) List(ctx context.Context, req *dto.AgentRechargeListRequest) (
case constants.AgentRechargeSourceAgentOnline:
query = query.Where("payment_method IN ?", []string{constants.RechargeMethodWechat, constants.RechargeMethodAlipay})
}
if req.StartDate != "" {
query = query.Where("created_at >= ?", req.StartDate+" 00:00:00")
if startTime != nil {
query = query.Where("created_at >= ?", *startTime)
}
if req.EndDate != "" {
query = query.Where("created_at <= ?", req.EndDate+" 23:59:59")
if endTime != nil {
query = query.Where("created_at <= ?", *endTime)
}
var total int64

View File

@@ -3,6 +3,7 @@ package asset_allocation_record
import (
"context"
"encoding/json"
"time"
"github.com/break/junhong_cmp_fiber/internal/model"
"github.com/break/junhong_cmp_fiber/internal/model/dto"
@@ -34,7 +35,7 @@ func New(
}
}
func (s *Service) List(ctx context.Context, req *dto.ListAssetAllocationRecordRequest, userShopID *uint) (*dto.ListAssetAllocationRecordResponse, error) {
func (s *Service) List(ctx context.Context, req *dto.ListAssetAllocationRecordRequest, startTime, endTime *time.Time, userShopID *uint) (*dto.ListAssetAllocationRecordResponse, error) {
page := req.Page
pageSize := req.PageSize
if page == 0 {
@@ -71,11 +72,11 @@ func (s *Service) List(ctx context.Context, req *dto.ListAssetAllocationRecordRe
if req.OperatorID != nil {
filters["operator_id"] = *req.OperatorID
}
if req.CreatedAtStart != nil {
filters["created_at_start"] = *req.CreatedAtStart
if startTime != nil {
filters["start_time"] = *startTime
}
if req.CreatedAtEnd != nil {
filters["created_at_end"] = *req.CreatedAtEnd
if endTime != nil {
filters["end_time"] = *endTime
}
if userShopID != nil {

View File

@@ -49,7 +49,7 @@ func New(
}
}
func (s *Service) ListWithdrawalRequests(ctx context.Context, req *dto.WithdrawalRequestListReq) (*dto.WithdrawalRequestPageResult, error) {
func (s *Service) ListWithdrawalRequests(ctx context.Context, req *dto.WithdrawalRequestListReq, startTime, endTime *time.Time) (*dto.WithdrawalRequestPageResult, error) {
opts := &store.QueryOptions{
Page: req.Page,
PageSize: req.PageSize,
@@ -65,19 +65,8 @@ func (s *Service) ListWithdrawalRequests(ctx context.Context, req *dto.Withdrawa
filters := &postgres.WithdrawalRequestListFilters{
WithdrawalNo: req.WithdrawalNo,
Status: req.Status,
}
if req.StartTime != "" {
t, err := time.Parse("2006-01-02 15:04:05", req.StartTime)
if err == nil {
filters.StartTime = &t
}
}
if req.EndTime != "" {
t, err := time.Parse("2006-01-02 15:04:05", req.EndTime)
if err == nil {
filters.EndTime = &t
}
StartTime: startTime,
EndTime: endTime,
}
requests, total, err := s.commissionWithdrawalReqStore.List(ctx, opts, filters)

View File

@@ -170,7 +170,7 @@ func (s *Service) CreateBatchAllocationTask(ctx context.Context, req *dto.Create
}, nil
}
func (s *Service) List(ctx context.Context, req *dto.ListDeviceImportTaskRequest) (*dto.ListDeviceImportTaskResponse, error) {
func (s *Service) List(ctx context.Context, req *dto.ListDeviceImportTaskRequest, startTime, endTime *time.Time) (*dto.ListDeviceImportTaskResponse, error) {
page := req.Page
pageSize := req.PageSize
if page == 0 {
@@ -195,11 +195,11 @@ func (s *Service) List(ctx context.Context, req *dto.ListDeviceImportTaskRequest
if req.BatchNo != "" {
filters["batch_no"] = req.BatchNo
}
if req.StartTime != nil {
filters["start_time"] = *req.StartTime
if startTime != nil {
filters["start_time"] = *startTime
}
if req.EndTime != nil {
filters["end_time"] = *req.EndTime
if endTime != nil {
filters["end_time"] = *endTime
}
tasks, total, err := s.importTaskStore.List(ctx, opts, filters)

View File

@@ -247,8 +247,8 @@ type ListRecordsRequest struct {
ICCID string
AuthorizerType *int
Status *int
StartTime string
EndTime string
StartTime *time.Time
EndTime *time.Time
Page int
PageSize int
}
@@ -294,24 +294,12 @@ func (s *AuthorizationService) ListRecords(ctx context.Context, req ListRecordsR
ICCID: req.ICCID,
AuthorizerType: req.AuthorizerType,
Status: req.Status,
StartTime: req.StartTime,
EndTime: req.EndTime,
Offset: (req.Page - 1) * req.PageSize,
Limit: req.PageSize,
}
if req.StartTime != "" {
t, err := parseDate(req.StartTime)
if err == nil {
opts.StartTime = &t
}
}
if req.EndTime != "" {
t, err := parseDate(req.EndTime)
if err == nil {
endTime := t.AddDate(0, 0, 1)
opts.EndTime = &endTime
}
}
results, total, err := s.authorizationStore.ListWithJoin(ctx, opts)
if err != nil {
return nil, err
@@ -523,7 +511,3 @@ func (s *AuthorizationService) recordRemarkFailure(ctx context.Context, record *
CardAuthorizations: []accessauditapp.EnterpriseCardAuthorizationChange{{Authorization: auth}},
}, originalErr)
}
func parseDate(dateStr string) (time.Time, error) {
return time.ParseInLocation("2006-01-02", dateStr, time.Local)
}

View File

@@ -73,6 +73,12 @@ func (s *Service) CreateTask(ctx context.Context, req *dto.CreateExportTaskReque
return nil, errors.New(errors.CodeInvalidParam, "导出格式不支持")
}
// 受影响场景的时间边界在创建期校验并规范化为 UTC RFC3339 秒级字符串后随筛选一起冻结,
// 执行期只按冻结值严格解析;旧参数键与非法格式一律在创建期拒绝。
if err := exporter.NormalizeTaskTimeFilters(req.Scene, req.Query); err != nil {
return nil, err
}
queryJSON := datatypes.JSON("{}")
if req.Query != nil {
raw, err := sonic.Marshal(req.Query)
@@ -173,7 +179,7 @@ func (s *Service) CreateTask(ctx context.Context, req *dto.CreateExportTaskReque
}
// ListTasks 查询导出任务列表。
func (s *Service) ListTasks(ctx context.Context, req *dto.ListExportTaskRequest) (*dto.ListExportTaskResponse, error) {
func (s *Service) ListTasks(ctx context.Context, req *dto.ListExportTaskRequest, startTime, endTime *time.Time) (*dto.ListExportTaskResponse, error) {
page := req.Page
if page <= 0 {
page = 1
@@ -194,11 +200,11 @@ func (s *Service) ListTasks(ctx context.Context, req *dto.ListExportTaskRequest)
if req.Status != nil {
filters["status"] = *req.Status
}
if req.StartTime != nil {
filters["start_time"] = *req.StartTime
if startTime != nil {
filters["start_time"] = *startTime
}
if req.EndTime != nil {
filters["end_time"] = *req.EndTime
if endTime != nil {
filters["end_time"] = *endTime
}
items, total, err := s.taskStore.List(ctx, &store.QueryOptions{

View File

@@ -150,7 +150,7 @@ func (s *Service) CreateImportTask(ctx context.Context, req *dto.ImportIotCardRe
}, nil
}
func (s *Service) List(ctx context.Context, req *dto.ListImportTaskRequest) (*dto.ListImportTaskResponse, error) {
func (s *Service) List(ctx context.Context, req *dto.ListImportTaskRequest, startTime, endTime *time.Time) (*dto.ListImportTaskResponse, error) {
page := req.Page
pageSize := req.PageSize
if page == 0 {
@@ -175,11 +175,11 @@ func (s *Service) List(ctx context.Context, req *dto.ListImportTaskRequest) (*dt
if req.BatchNo != "" {
filters["batch_no"] = req.BatchNo
}
if req.StartTime != nil {
filters["start_time"] = *req.StartTime
if startTime != nil {
filters["start_time"] = *startTime
}
if req.EndTime != nil {
filters["end_time"] = *req.EndTime
if endTime != nil {
filters["end_time"] = *endTime
}
tasks, total, err := s.importTaskStore.List(ctx, opts, filters)

View File

@@ -1297,7 +1297,7 @@ func (s *Service) Get(ctx context.Context, id uint) (*dto.OrderResponse, error)
return s.buildOrderResponse(ctx, order, items), nil
}
func (s *Service) List(ctx context.Context, req *dto.OrderListRequest, buyerType string, buyerID uint) (*dto.OrderListResponse, error) {
func (s *Service) List(ctx context.Context, req *dto.OrderListRequest, startTime, endTime *time.Time, buyerType string, buyerID uint) (*dto.OrderListResponse, error) {
page := req.Page
pageSize := req.PageSize
if page == 0 {
@@ -1338,11 +1338,11 @@ func (s *Service) List(ctx context.Context, req *dto.OrderListRequest, buyerType
if req.SellerShopID != nil {
filters["seller_shop_id"] = *req.SellerShopID
}
if req.StartTime != nil {
filters["start_time"] = req.StartTime
if startTime != nil {
filters["start_time"] = *startTime
}
if req.EndTime != nil {
filters["end_time"] = req.EndTime
if endTime != nil {
filters["end_time"] = *endTime
}
if req.Identifier != "" {
resolvedIotCardID, resolvedDeviceID, err := s.resolveOrderListAssetIdentifier(ctx, req.Identifier)

View File

@@ -16,6 +16,7 @@ import (
"github.com/break/junhong_cmp_fiber/pkg/constants"
"github.com/break/junhong_cmp_fiber/pkg/errors"
"github.com/break/junhong_cmp_fiber/pkg/middleware"
"github.com/break/junhong_cmp_fiber/pkg/utils"
"go.uber.org/zap"
"gorm.io/gorm"
)
@@ -73,7 +74,7 @@ func New(
// ListShopWithdrawalRequests 查询代理商提现记录
// GET /shops/:id/withdrawal-requests
func (s *Service) ListShopWithdrawalRequests(ctx context.Context, shopID uint, req *dto.ShopWithdrawalRequestListReq) (*dto.ShopWithdrawalRequestPageResult, error) {
func (s *Service) ListShopWithdrawalRequests(ctx context.Context, shopID uint, req *dto.ShopWithdrawalRequestListReq, startTime, endTime *time.Time) (*dto.ShopWithdrawalRequestPageResult, error) {
// 越权校验:平台人员可查所有,代理只能查自己和下级
if err := middleware.CanManageShop(ctx, shopID); err != nil {
return nil, errors.New(errors.CodeForbidden, "无权限操作该资源或资源不存在")
@@ -99,19 +100,8 @@ func (s *Service) ListShopWithdrawalRequests(ctx context.Context, shopID uint, r
filters := &postgres.WithdrawalRequestListFilters{
ShopID: shopID,
WithdrawalNo: req.WithdrawalNo,
}
if req.StartTime != "" {
t, err := time.Parse("2006-01-02 15:04:05", req.StartTime)
if err == nil {
filters.StartTime = &t
}
}
if req.EndTime != "" {
t, err := time.Parse("2006-01-02 15:04:05", req.EndTime)
if err == nil {
filters.EndTime = &t
}
StartTime: startTime,
EndTime: endTime,
}
requests, total, err := s.commissionWithdrawalReqStore.ListByShopID(ctx, opts, filters)
@@ -249,7 +239,7 @@ func (s *Service) buildShopHierarchyPath(ctx context.Context, shop *model.Shop)
// ListShopCommissionRecords 查询代理商佣金明细
// GET /shops/:id/commission-records
// 原佣金与回溯明细按同一分页与排序口径合并返回,筛选与数据范围在合并前各自应用。
func (s *Service) ListShopCommissionRecords(ctx context.Context, shopID uint, req *dto.ShopCommissionRecordListReq) (*dto.ShopCommissionRecordPageResult, error) {
func (s *Service) ListShopCommissionRecords(ctx context.Context, shopID uint, req *dto.ShopCommissionRecordListReq, startTime, endTime *time.Time) (*dto.ShopCommissionRecordPageResult, error) {
// 越权校验:平台人员可查所有,代理只能查自己和下级
if err := middleware.CanManageShop(ctx, shopID); err != nil {
return nil, errors.New(errors.CodeForbidden, "无权限操作该资源或资源不存在")
@@ -280,6 +270,8 @@ func (s *Service) ListShopCommissionRecords(ctx context.Context, shopID uint, re
ICCID: req.ICCID,
DeviceNo: req.VirtualNo,
OrderNo: req.OrderNo,
StartTime: formatLedgerTimeFilter(startTime),
EndTime: formatLedgerTimeFilter(endTime),
Status: req.Status,
}
@@ -445,6 +437,15 @@ func buildShopCommissionRecordItem(row *postgres.CommissionLedgerRow, shopNameMa
return item
}
// formatLedgerTimeFilter 把入口严格解析后的 UTC 瞬时转换为佣金明细列表的时间筛选值。
func formatLedgerTimeFilter(value *time.Time) *string {
if value == nil {
return nil
}
formatted := utils.FormatTimeFilterValue(*value)
return &formatted
}
// buildClawbackItems 把回溯摘要投影为明细项。
func buildClawbackItems(summaries []postgres.CommissionClawbackSummary) []dto.ShopCommissionClawbackItem {
if len(summaries) == 0 {