feat: 采集记录成功失败分表并保存网关原始数据,到期归档 csv.gz,新增记录分页查询接口

- 网关客户端新增原始数据收集器,记录最后一次尝试的明文请求、HTTP 状态、响应体与 code/msg/trace_id
- tb_card_traffic_collection 只写成功读数,新增 carrier_id 与原始数据列;新增 tb_card_traffic_collection_failure,失败不判断有无套餐并带错误详情
- 采集记录在线保留当月加最近 2 个整月,到期分区摘出、导出 csv.gz、校验行数与 SHA-256 后删除,本地保留 3 个月
- 新增采集成功/失败、卡日流量、套餐日流量详单、冲正流水、退款后处理尝试列表接口:可查单个也可查全部,分页与条件筛选
- 停复机记录支持资产标识、场景、原因、指令号筛选;单卡历史支持动作、结果、来源筛选
- 单卡采集记录支持筛选与合并失败记录;套餐日流量详单支持分页;退款列表支持后处理状态筛选
- 测试环境 api、worker 日志分目录,保留 40 个压缩备份;worker 挂载 archive 目录
- 迁移 000272、000273 需维护者在测试库执行后再部署

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
邹进
2026-11-05 18:47:00 +09:00
parent 8eb7d403c4
commit 94cbf2adab
39 changed files with 1794 additions and 140 deletions

View File

@@ -0,0 +1,376 @@
package asset
import (
"context"
"encoding/json"
stderrors "errors"
"time"
"gorm.io/gorm"
"github.com/break/junhong_cmp_fiber/internal/domain/cardflow"
"github.com/break/junhong_cmp_fiber/internal/model"
"github.com/break/junhong_cmp_fiber/internal/model/dto"
"github.com/break/junhong_cmp_fiber/pkg/constants"
"github.com/break/junhong_cmp_fiber/pkg/errors"
"github.com/break/junhong_cmp_fiber/pkg/middleware"
)
const (
recordDefaultPageSize = 20
recordMaxPageSize = 100
recordDateLayout = "2006-01-02"
)
// recordScope 是资产标识解析后的查询范围:all 为 true 表示不按资产过滤。
type recordScope struct {
all bool
cardIDs []uint
deviceID uint
}
func (r recordScope) empty() bool { return !r.all && len(r.cardIDs) == 0 && r.deviceID == 0 }
// resolveRecordScope 把选填的资产标识解析为卡 ID(设备取其绑定卡);不传标识查全部时只允许平台账号。
// 标识解析不到资产时返回空范围,调用方直接返回空页。
func (s *Service) resolveRecordScope(ctx context.Context, identifier string) (recordScope, error) {
if identifier == "" {
userType := middleware.GetUserTypeFromContext(ctx)
if userType != constants.UserTypeSuperAdmin && userType != constants.UserTypePlatform {
return recordScope{}, errors.New(errors.CodeForbidden, "只有平台账号可以不带资产标识查询全部记录")
}
return recordScope{all: true}, nil
}
asset, err := s.Resolve(ctx, identifier, false)
if err != nil {
var appErr *errors.AppError
if stderrors.As(err, &appErr) && appErr.Code == errors.CodeNotFound {
return recordScope{}, nil
}
return recordScope{}, err
}
if asset.AssetType == "card" {
return recordScope{cardIDs: []uint{asset.AssetID}}, nil
}
var cardIDs []uint
if err := s.db.WithContext(ctx).Model(&model.DeviceSimBinding{}).
Where("device_id = ? AND bind_status = ?", asset.AssetID, constants.BindStatusBound).
Pluck("iot_card_id", &cardIDs).Error; err != nil {
return recordScope{}, errors.Wrap(errors.CodeDatabaseError, err, "查询设备绑定卡失败")
}
return recordScope{cardIDs: cardIDs, deviceID: asset.AssetID}, nil
}
// parseRecordTimeRange 解析必填时间范围(结束不含,跨度不超过 31 天)。
func parseRecordTimeRange(start, end string) (time.Time, time.Time, error) {
from, err := parseCollectionTime(start)
if err != nil {
return time.Time{}, time.Time{}, err
}
to, err := parseCollectionTime(end)
if err != nil {
return time.Time{}, time.Time{}, err
}
if !to.After(from) || to.Sub(from) > maxCollectionQuerySpan {
return time.Time{}, time.Time{}, errors.New(errors.CodeInvalidParam, "结束时间必须晚于开始时间,且跨度不超过 31 天")
}
return from, to, nil
}
// parseRecordDateRange 解析必填日期范围(含首尾,跨度不超过 31 天)。
func parseRecordDateRange(start, end string) (time.Time, time.Time, error) {
location := cardflow.ShanghaiDate(time.Now()).Location()
from, err := time.ParseInLocation(recordDateLayout, start, location)
if err != nil {
return time.Time{}, time.Time{}, errors.New(errors.CodeInvalidParam, "开始日期格式无效,应为 2006-01-02")
}
to, err := time.ParseInLocation(recordDateLayout, end, location)
if err != nil {
return time.Time{}, time.Time{}, errors.New(errors.CodeInvalidParam, "结束日期格式无效,应为 2006-01-02")
}
if to.Before(from) || to.Sub(from) > maxCollectionQuerySpan {
return time.Time{}, time.Time{}, errors.New(errors.CodeInvalidParam, "结束日期不能早于开始日期,且跨度不超过 31 天")
}
return from, to, nil
}
func recordPage(page, size, maxSize int) (int, int) {
if page <= 0 {
page = 1
}
if size <= 0 {
size = recordDefaultPageSize
}
if size > maxSize {
size = maxSize
}
return page, size
}
// pageQuery 统计总数后按排序取当前页。
func pageQuery[T any](query *gorm.DB, order string, page, size int) ([]T, int64, error) {
var total int64
if err := query.Count(&total).Error; err != nil {
return nil, 0, err
}
rows := make([]T, 0, size)
if total == 0 {
return rows, 0, nil
}
err := query.Order(order).Offset((page - 1) * size).Limit(size).Find(&rows).Error
return rows, total, err
}
func gatewayRawItem(raw model.CollectionRaw) dto.GatewayRawItem {
return dto.GatewayRawItem{
RawRequest: json.RawMessage(raw.RawRequest), HTTPStatus: raw.HTTPStatus, GatewayCode: raw.GatewayCode,
GatewayMsg: raw.GatewayMsg, GatewayTraceID: raw.GatewayTraceID, RawResponse: json.RawMessage(raw.RawResponse),
RawResponseText: raw.RawResponseText, RawTruncated: raw.RawTruncated, GatewayAttempts: raw.GatewayAttempts,
}
}
func collectionSuccessItem(row model.CardTrafficCollection) dto.CardTrafficCollectionItem {
return dto.CardTrafficCollectionItem{
ID: row.ID, ObservedAt: row.ObservedAt, ObservationID: row.ObservationID, Source: row.Source,
Scene: row.Scene, Result: row.Result, VendorUsedMB: row.VendorUsedMB, QueuePoints: json.RawMessage(row.QueuePoints),
Decision: row.Decision, MonthUsedMB: row.MonthUsedMB, StaleGuarded: row.StaleGuarded,
DeltaMB: row.DeltaMB, EventID: row.EventID, RecordKind: "success", GatewayRawItem: gatewayRawItem(row.CollectionRaw),
}
}
func collectionFailureItem(row model.CardTrafficCollectionFailure) dto.TrafficCollectionFailureItem {
return dto.TrafficCollectionFailureItem{
ID: row.ID, IotCardID: row.IotCardID, ICCID: row.ICCID, CarrierID: row.CarrierID, ObservedAt: row.ObservedAt,
ObservationID: row.ObservationID, Source: row.Source, Scene: row.Scene, Result: row.Result,
ErrorCategory: row.ErrorCategory, ProviderCode: row.ProviderCode, ProviderMessage: row.ProviderMessage,
DurationMS: row.DurationMS, GatewayRawItem: gatewayRawItem(row.CollectionRaw),
}
}
// ListTrafficCollectionRecords 查询采集成功记录(可查单个也可查全部)。
func (s *Service) ListTrafficCollectionRecords(ctx context.Context, req *dto.TrafficCollectionListRequest) (*dto.TrafficCollectionRecordListResponse, error) {
from, to, err := parseRecordTimeRange(req.StartTime, req.EndTime)
if err != nil {
return nil, err
}
page, size := recordPage(req.Page, req.PageSize, recordMaxPageSize)
resp := &dto.TrafficCollectionRecordListResponse{Items: []dto.TrafficCollectionRecordItem{}, Page: page, PageSize: size}
scope, err := s.resolveRecordScope(ctx, req.Identifier)
if err != nil || scope.empty() {
return resp, err
}
query := s.db.WithContext(ctx).Model(&model.CardTrafficCollection{}).
Where("observed_at >= ? AND observed_at < ? AND result = ?", from, to, constants.TrafficCollectionResultOK)
if !scope.all {
query = query.Where("iot_card_id IN ?", scope.cardIDs)
}
if req.CarrierID != nil {
query = query.Where("carrier_id = ?", *req.CarrierID)
}
query = applyStringFilters(query, map[string]string{"decision": req.Decision, "source": req.Source, "scene": req.Scene})
if req.HasDelta != nil {
if *req.HasDelta {
query = query.Where("delta_mb > 0")
} else {
query = query.Where("(delta_mb IS NULL OR delta_mb = 0)")
}
}
if req.StaleGuarded != nil {
query = query.Where("stale_guarded = ?", *req.StaleGuarded)
}
rows, total, err := pageQuery[model.CardTrafficCollection](query, "observed_at DESC, id DESC", page, size)
if err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询采集成功记录失败")
}
for _, row := range rows {
resp.Items = append(resp.Items, dto.TrafficCollectionRecordItem{
CardTrafficCollectionItem: collectionSuccessItem(row), IotCardID: row.IotCardID, CarrierID: row.CarrierID,
})
}
resp.Total = total
return resp, nil
}
// ListTrafficCollectionFailures 查询采集失败记录(可查单个也可查全部)。
func (s *Service) ListTrafficCollectionFailures(ctx context.Context, req *dto.TrafficCollectionFailureListRequest) (*dto.TrafficCollectionFailureListResponse, error) {
from, to, err := parseRecordTimeRange(req.StartTime, req.EndTime)
if err != nil {
return nil, err
}
page, size := recordPage(req.Page, req.PageSize, recordMaxPageSize)
resp := &dto.TrafficCollectionFailureListResponse{Items: []dto.TrafficCollectionFailureItem{}, Page: page, PageSize: size}
scope, err := s.resolveRecordScope(ctx, req.Identifier)
if err != nil || scope.empty() {
return resp, err
}
query := s.db.WithContext(ctx).Model(&model.CardTrafficCollectionFailure{}).Where("observed_at >= ? AND observed_at < ?", from, to)
if !scope.all {
query = query.Where("iot_card_id IN ?", scope.cardIDs)
}
if req.CarrierID != nil {
query = query.Where("carrier_id = ?", *req.CarrierID)
}
query = applyStringFilters(query, map[string]string{
"result": req.Result, "error_category": req.ErrorCategory, "provider_code": req.ProviderCode, "source": req.Source, "scene": req.Scene,
})
rows, total, err := pageQuery[model.CardTrafficCollectionFailure](query, "observed_at DESC, id DESC", page, size)
if err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询采集失败记录失败")
}
for _, row := range rows {
resp.Items = append(resp.Items, collectionFailureItem(row))
}
resp.Total = total
return resp, nil
}
// ListCardDailyUsages 查询卡日流量(可查单个也可查全部)。
func (s *Service) ListCardDailyUsages(ctx context.Context, req *dto.CardDailyUsageListRequest) (*dto.CardDailyUsageListResponse, error) {
from, to, err := parseRecordDateRange(req.StartDate, req.EndDate)
if err != nil {
return nil, err
}
page, size := recordPage(req.Page, req.PageSize, recordMaxPageSize)
resp := &dto.CardDailyUsageListResponse{Items: []dto.CardDailyUsageItem{}, Page: page, PageSize: size}
scope, err := s.resolveRecordScope(ctx, req.Identifier)
if err != nil || scope.empty() {
return resp, err
}
type row struct {
model.CardDailyUsage
ICCID string
CarrierID uint
}
query := s.db.WithContext(ctx).Table("tb_card_daily_usage AS u").
Select("u.*, c.iccid, c.carrier_id").Joins("LEFT JOIN tb_iot_card c ON c.id = u.iot_card_id").
Where("u.date >= ? AND u.date <= ?", from.Format(recordDateLayout), to.Format(recordDateLayout))
if !scope.all {
query = query.Where("u.iot_card_id IN ?", scope.cardIDs)
}
if req.CarrierID != nil {
query = query.Where("c.carrier_id = ?", *req.CarrierID)
}
if req.MinUsageMB != nil {
query = query.Where("u.usage_mb >= ?", *req.MinUsageMB)
}
rows, total, err := pageQuery[row](query, "u.date DESC, u.id DESC", page, size)
if err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询卡日流量失败")
}
for _, item := range rows {
resp.Items = append(resp.Items, dto.CardDailyUsageItem{
ID: item.ID, IotCardID: item.IotCardID, ICCID: item.ICCID, CarrierID: item.CarrierID,
Date: item.Date.Format(recordDateLayout), UsageMB: item.UsageMB, UpdatedAt: item.UpdatedAt,
})
}
resp.Total = total
return resp, nil
}
// ListPackageUsageDailyRecords 查询套餐日流量详单(可查单个也可查全部)。
func (s *Service) ListPackageUsageDailyRecords(ctx context.Context, req *dto.PackageUsageDailyRecordListRequest) (*dto.PackageUsageDailyRecordListResponse, error) {
from, to, err := parseRecordDateRange(req.StartDate, req.EndDate)
if err != nil {
return nil, err
}
page, size := recordPage(req.Page, req.PageSize, recordMaxPageSize)
resp := &dto.PackageUsageDailyRecordListResponse{Items: []dto.PackageUsageDailyRecordItem{}, Page: page, PageSize: size}
scope, err := s.resolveRecordScope(ctx, req.Identifier)
if err != nil || scope.empty() {
return resp, err
}
type row struct {
model.PackageUsageDailyRecord
PackageID uint
IotCardID uint
DeviceID uint
}
query := s.db.WithContext(ctx).Table("tb_package_usage_daily_record AS r").
Select("r.*, pu.package_id, COALESCE(pu.iot_card_id, 0) AS iot_card_id, COALESCE(pu.device_id, 0) AS device_id").
Joins("JOIN tb_package_usage pu ON pu.id = r.package_usage_id").
Where("r.date >= ? AND r.date <= ?", from.Format(recordDateLayout), to.Format(recordDateLayout))
if !scope.all {
if scope.deviceID > 0 {
query = query.Where("(pu.device_id = ? OR pu.iot_card_id IN ?)", scope.deviceID, append([]uint{0}, scope.cardIDs...))
} else {
query = query.Where("pu.iot_card_id IN ?", scope.cardIDs)
}
}
if req.PackageUsageID != nil {
query = query.Where("r.package_usage_id = ?", *req.PackageUsageID)
}
if req.PackageID != nil {
query = query.Where("pu.package_id = ?", *req.PackageID)
}
if req.CarrierID != nil {
query = query.Where("pu.iot_card_id IN (SELECT id FROM tb_iot_card WHERE carrier_id = ?)", *req.CarrierID)
}
rows, total, err := pageQuery[row](query, "r.date DESC, r.id DESC", page, size)
if err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询套餐日流量详单失败")
}
for _, item := range rows {
resp.Items = append(resp.Items, dto.PackageUsageDailyRecordItem{
ID: item.ID, PackageUsageID: item.PackageUsageID, PackageID: item.PackageID, IotCardID: item.IotCardID,
DeviceID: item.DeviceID, Date: item.Date.Format(recordDateLayout), DailyUsageMB: item.DailyUsageMB,
CumulativeUsageMB: item.CumulativeUsageMB, UpdatedAt: item.UpdatedAt,
})
}
resp.Total = total
return resp, nil
}
// ListPackageTrafficAdjustmentRecords 查询套餐流量冲正流水(可查单个也可查全部)。
func (s *Service) ListPackageTrafficAdjustmentRecords(ctx context.Context, req *dto.PackageTrafficAdjustmentQueryRequest) (*dto.PackageTrafficAdjustmentRecordListResponse, error) {
from, to, err := parseRecordTimeRange(req.StartTime, req.EndTime)
if err != nil {
return nil, err
}
page, size := recordPage(req.Page, req.PageSize, recordMaxPageSize)
resp := &dto.PackageTrafficAdjustmentRecordListResponse{Items: []dto.PackageTrafficAdjustmentRecordItem{}, Page: page, PageSize: size}
scope, err := s.resolveRecordScope(ctx, req.Identifier)
if err != nil || scope.empty() {
return resp, err
}
query := s.db.WithContext(ctx).Model(&model.PackageUsageAdjustment{}).Where("created_at >= ? AND created_at < ?", from, to)
if !scope.all {
if scope.deviceID > 0 {
query = query.Where("(device_id = ? OR iot_card_id IN ?)", scope.deviceID, append([]uint{0}, scope.cardIDs...))
} else {
query = query.Where("iot_card_id IN ?", scope.cardIDs)
}
}
if req.PackageUsageID != nil {
query = query.Where("package_usage_id = ?", *req.PackageUsageID)
}
if req.OperatorID != nil {
query = query.Where("operator_id = ?", *req.OperatorID)
}
switch req.Direction {
case "deduct":
query = query.Where("delta_mb > 0")
case "refund":
query = query.Where("delta_mb < 0")
}
rows, total, err := pageQuery[model.PackageUsageAdjustment](query, "created_at DESC, id DESC", page, size)
if err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询套餐流量冲正流水失败")
}
for _, row := range rows {
resp.Items = append(resp.Items, dto.PackageTrafficAdjustmentRecordItem{
PackageTrafficAdjustmentItem: toTrafficAdjustmentItem(row), IotCardID: row.IotCardID, DeviceID: row.DeviceID,
})
}
resp.Total = total
return resp, nil
}
// applyStringFilters 对非空字符串条件追加等值过滤(列名为内部常量,不来自请求)。
func applyStringFilters(query *gorm.DB, filters map[string]string) *gorm.DB {
for column, value := range filters {
if value != "" {
query = query.Where(column+" = ?", value)
}
}
return query
}

View File

@@ -175,6 +175,13 @@ func (s *Service) ListPackageTrafficAdjustments(ctx context.Context, assetType s
size = 20
}
query := s.db.WithContext(ctx).Model(&model.PackageUsageAdjustment{}).Where("package_usage_id = ?", req.PackageUsageID)
if req.StartTime != "" || req.EndTime != "" {
from, to, err := parseRecordTimeRange(req.StartTime, req.EndTime)
if err != nil {
return nil, err
}
query = query.Where("created_at >= ? AND created_at < ?", from, to)
}
var total int64
if err := query.Count(&total).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询冲正流水失败")

View File

@@ -2,12 +2,15 @@ package asset
import (
"context"
"encoding/json"
"sort"
"time"
"gorm.io/gorm"
"github.com/break/junhong_cmp_fiber/internal/domain/cardflow"
"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"
)
@@ -37,22 +40,72 @@ func (s *Service) ListCardTrafficCollections(ctx context.Context, cardID uint, r
if size <= 0 {
size = 50
}
rows, total, err := postgres.NewCardTrafficCollectionStore(s.db).List(ctx, postgres.CardTrafficCollectionQuery{
CardID: cardID, From: from, To: to, Page: page, PageSize: size,
})
if err != nil {
success := s.db.WithContext(ctx).Model(&model.CardTrafficCollection{}).
Where("iot_card_id = ? AND observed_at >= ? AND observed_at < ? AND result = ?", cardID, from, to, constants.TrafficCollectionResultOK)
success = applyStringFilters(success, map[string]string{"decision": req.Decision, "source": req.Source, "scene": req.Scene})
if !req.IncludeFailures {
rows, total, err := pageQuery[model.CardTrafficCollection](success, "observed_at DESC, id DESC", page, size)
if err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询卡流量采集记录失败")
}
items := make([]dto.CardTrafficCollectionItem, 0, len(rows))
for _, row := range rows {
items = append(items, collectionSuccessItem(row))
}
return &dto.CardTrafficCollectionListResponse{Items: items, Total: total}, nil
}
return s.listCardCollectionsWithFailures(ctx, success, cardID, from, to, req, page, size)
}
// listCardCollectionsWithFailures 合并单卡的成功与失败记录,按采集时间倒序分页(单卡 31 天内数据量有限,取前 page*size 条归并)。
func (s *Service) listCardCollectionsWithFailures(ctx context.Context, success *gorm.DB, cardID uint, from, to time.Time,
req *dto.CardTrafficCollectionListRequest, page, size int) (*dto.CardTrafficCollectionListResponse, error) {
failure := s.db.WithContext(ctx).Model(&model.CardTrafficCollectionFailure{}).
Where("iot_card_id = ? AND observed_at >= ? AND observed_at < ?", cardID, from, to)
failure = applyStringFilters(failure, map[string]string{"source": req.Source, "scene": req.Scene})
var successTotal, failureTotal int64
if err := success.Count(&successTotal).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询卡流量采集记录失败")
}
items := make([]dto.CardTrafficCollectionItem, 0, len(rows))
for _, row := range rows {
items = append(items, dto.CardTrafficCollectionItem{
ID: row.ID, ObservedAt: row.ObservedAt, ObservationID: row.ObservationID, Source: row.Source,
Scene: row.Scene, Result: row.Result, VendorUsedMB: row.VendorUsedMB, QueuePoints: json.RawMessage(row.QueuePoints),
Decision: row.Decision, MonthUsedMB: row.MonthUsedMB, StaleGuarded: row.StaleGuarded,
DeltaMB: row.DeltaMB, EventID: row.EventID,
if err := failure.Count(&failureTotal).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询卡流量采集失败记录失败")
}
window := page * size
var successRows []model.CardTrafficCollection
if err := success.Order("observed_at DESC, id DESC").Limit(window).Find(&successRows).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询卡流量采集记录失败")
}
var failureRows []model.CardTrafficCollectionFailure
if err := failure.Order("observed_at DESC, id DESC").Limit(window).Find(&failureRows).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询卡流量采集失败记录失败")
}
merged := make([]dto.CardTrafficCollectionItem, 0, len(successRows)+len(failureRows))
for _, row := range successRows {
merged = append(merged, collectionSuccessItem(row))
}
for _, row := range failureRows {
f := collectionFailureItem(row)
merged = append(merged, dto.CardTrafficCollectionItem{
ID: f.ID, ObservedAt: f.ObservedAt, ObservationID: f.ObservationID, Source: f.Source, Scene: f.Scene,
Result: f.Result, RecordKind: "failure", ErrorCategory: f.ErrorCategory, ProviderCode: f.ProviderCode,
ProviderMessage: f.ProviderMessage, DurationMS: f.DurationMS, GatewayRawItem: f.GatewayRawItem,
})
}
return &dto.CardTrafficCollectionListResponse{Items: items, Total: total}, nil
sort.SliceStable(merged, func(i, j int) bool {
if !merged[i].ObservedAt.Equal(merged[j].ObservedAt) {
return merged[i].ObservedAt.After(merged[j].ObservedAt)
}
return merged[i].ID > merged[j].ID
})
start := (page - 1) * size
if start > len(merged) {
start = len(merged)
}
end := start + size
if end > len(merged) {
end = len(merged)
}
return &dto.CardTrafficCollectionListResponse{Items: merged[start:end], Total: successTotal + failureTotal}, nil
}
func parseCollectionTime(value string) (time.Time, error) {

View File

@@ -36,7 +36,8 @@ func NewDailyRecordService(
// GetDailyRecords 任务 13.2-13.5: 查询套餐流量详单
// 查询指定套餐使用记录的日流量明细
func (s *DailyRecordService) GetDailyRecords(ctx context.Context, packageUsageID uint, startDate, endDate string) (*dto.PackageUsageDetailResponse, error) {
// GetDailyRecords 查询套餐流量详单;page_size 大于 0 时按日期倒序分页,否则按日期正序返回全部(兼容旧调用)。
func (s *DailyRecordService) GetDailyRecords(ctx context.Context, packageUsageID uint, startDate, endDate string, page, pageSize int) (*dto.PackageUsageDetailResponse, error) {
// 查询套餐使用记录
var usage model.PackageUsage
if err := s.db.WithContext(ctx).First(&usage, packageUsageID).Error; err != nil {
@@ -73,7 +74,27 @@ func (s *DailyRecordService) GetDailyRecords(ctx context.Context, packageUsageID
query = query.Where("date <= ?", end)
}
if err := query.Order("date ASC").Find(&records).Error; err != nil {
var summary struct {
Total int64
Usage int64
}
if err := query.Session(&gorm.Session{}).Model(&model.PackageUsageDailyRecord{}).
Select("count(*) AS total, COALESCE(sum(daily_usage_mb), 0) AS usage").Scan(&summary).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "统计日流量记录失败")
}
if pageSize > 0 {
if pageSize > 100 {
pageSize = 100
}
if page <= 0 {
page = 1
}
query = query.Order("date DESC").Offset((page - 1) * pageSize).Limit(pageSize)
} else {
page = 0
query = query.Order("date ASC")
}
if err := query.Find(&records).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询日流量记录失败")
}
@@ -87,14 +108,17 @@ func (s *DailyRecordService) GetDailyRecords(ctx context.Context, packageUsageID
DailyUsageMB: record.DailyUsageMB,
CumulativeUsageMB: record.CumulativeUsageMB,
}
totalUsageMB += int64(record.DailyUsageMB)
}
totalUsageMB = summary.Usage
response := &dto.PackageUsageDetailResponse{
PackageUsageID: packageUsageID,
PackageName: pkg.PackageName,
Records: recordResponses,
TotalUsageMB: totalUsageMB,
Total: summary.Total,
Page: page,
PageSize: pageSize,
}
return response, nil

View File

@@ -41,11 +41,19 @@ func (s *GatewayRateLimitService) ListStopResumeRecords(ctx context.Context, req
return nil, errors.New(errors.CodeInvalidParam, "停复机记录查询参数不合法:时间跨度须大于 0 且不超过 31 天")
}
page, size := normalizePage(req.Page, req.PageSize)
return s.listRecords(ctx, postgres.StopResumeRecordFilter{
filter := postgres.StopResumeRecordFilter{
ICCID: strings.TrimSpace(req.ICCID), CarrierID: req.CarrierID, Action: req.Action, Source: req.Source,
Result: req.Result, ErrorCategory: req.ErrorCategory, StartTime: req.StartTime, EndTime: req.EndTime,
Page: page, PageSize: size,
})
Scene: req.Scene, Reason: req.Reason, CommandID: strings.TrimSpace(req.CommandID), Page: page, PageSize: size,
}
if identifier := strings.TrimSpace(req.Identifier); identifier != "" {
cardIDs, err := s.cardIDsByIdentifier(ctx, identifier)
if err != nil {
return nil, err
}
filter.CardIDs = cardIDs
}
return s.listRecords(ctx, filter)
}
// ListCardStopResumeRecords 查询单卡停复机历史;未传时间默认最近 31 天。
@@ -73,7 +81,29 @@ func (s *GatewayRateLimitService) ListCardStopResumeRecords(ctx context.Context,
}
page, size := normalizePage(req.Page, req.PageSize)
cardID := req.ID
return s.listRecords(ctx, postgres.StopResumeRecordFilter{CardID: &cardID, StartTime: start, EndTime: end, Page: page, PageSize: size})
return s.listRecords(ctx, postgres.StopResumeRecordFilter{CardID: &cardID, StartTime: start, EndTime: end, Page: page, PageSize: size,
Action: req.Action, Result: req.Result, Source: req.Source})
}
// cardIDsByIdentifier 把资产标识解析为卡:卡按虚拟号、ICCID、MSISDN 匹配,设备按虚拟号、IMEI、SN 匹配后取其绑定卡。
// 匹配不到时返回空切片(查询结果为空页)。
func (s *GatewayRateLimitService) cardIDsByIdentifier(ctx context.Context, identifier string) ([]uint, error) {
cardIDs := []uint{}
if err := s.db.WithContext(ctx).Model(&model.IotCard{}).
Where("iccid = ? OR virtual_no = ? OR msisdn = ?", identifier, identifier, identifier).
Pluck("id", &cardIDs).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "按资产标识查询卡失败")
}
if len(cardIDs) > 0 {
return cardIDs, nil
}
if err := s.db.WithContext(ctx).Model(&model.DeviceSimBinding{}).
Joins("JOIN tb_device d ON d.id = tb_device_sim_binding.device_id AND d.deleted_at IS NULL").
Where("(d.virtual_no = ? OR d.imei = ? OR d.sn = ?) AND tb_device_sim_binding.bind_status = ?", identifier, identifier, identifier, constants.BindStatusBound).
Pluck("tb_device_sim_binding.iot_card_id", &cardIDs).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "按资产标识查询设备绑定卡失败")
}
return cardIDs, nil
}
func (s *GatewayRateLimitService) listRecords(ctx context.Context, filter postgres.StopResumeRecordFilter) (*dto.StopResumeRecordPageResult, error) {

View File

@@ -0,0 +1,93 @@
package refund
import (
"context"
"strings"
"time"
"github.com/break/junhong_cmp_fiber/internal/domain/cardflow"
"github.com/break/junhong_cmp_fiber/internal/model"
"github.com/break/junhong_cmp_fiber/internal/model/dto"
"github.com/break/junhong_cmp_fiber/pkg/constants"
"github.com/break/junhong_cmp_fiber/pkg/errors"
"github.com/break/junhong_cmp_fiber/pkg/middleware"
)
// attemptQueryMaxSpan 是尝试记录查询的最长时间跨度。
const attemptQueryMaxSpan = 31 * 24 * time.Hour
var attemptTimeLayouts = []string{time.RFC3339, "2006-01-02 15:04:05", "2006-01-02"}
// ListAssetPostProcessAttempts 分页查询退款资产后处理尝试记录(仅平台账号;可查单张退款单或单个资产,也可查全部)。
func (s *Service) ListAssetPostProcessAttempts(ctx context.Context, req *dto.RefundPostProcessAttemptListRequest) (*dto.RefundPostProcessAttemptListResponse, error) {
userType := middleware.GetUserTypeFromContext(ctx)
if userType != constants.UserTypeSuperAdmin && userType != constants.UserTypePlatform {
return nil, errors.New(errors.CodeForbidden, "只有平台账号可以查询退款资产后处理尝试记录")
}
from, err := parseAttemptTime(req.StartTime)
if err != nil {
return nil, err
}
to, err := parseAttemptTime(req.EndTime)
if err != nil {
return nil, err
}
if !to.After(from) || to.Sub(from) > attemptQueryMaxSpan {
return nil, errors.New(errors.CodeInvalidParam, "结束时间必须晚于开始时间,且跨度不超过 31 天")
}
page, size := req.Page, req.PageSize
if page <= 0 {
page = 1
}
if size <= 0 || size > 100 {
size = 20
}
resp := &dto.RefundPostProcessAttemptListResponse{Items: []dto.RefundPostProcessAttemptItem{}, Page: page, PageSize: size}
query := s.db.WithContext(ctx).Model(&model.RefundPostProcessAttempt{}).Where("created_at >= ? AND created_at < ?", from, to)
if req.RefundID != nil {
query = query.Where("refund_id = ?", *req.RefundID)
}
if refundNo := strings.TrimSpace(req.RefundNo); refundNo != "" {
query = query.Where("refund_no = ?", refundNo)
}
if identifier := strings.TrimSpace(req.Identifier); identifier != "" {
query = query.Where(`(iccid = ? OR (asset_type = 'iot_card' AND asset_id IN (SELECT id FROM tb_iot_card WHERE virtual_no = ? OR msisdn = ?))
OR (asset_type = 'device' AND asset_id IN (SELECT id FROM tb_device WHERE virtual_no = ? OR imei = ? OR sn = ?)))`,
identifier, identifier, identifier, identifier, identifier, identifier)
}
for column, value := range map[string]string{"step": req.Step, "result": req.Result, "error_code": req.ErrorCode, "trigger": req.Trigger} {
if value != "" {
query = query.Where(column+" = ?", value)
}
}
var total int64
if err := query.Count(&total).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询退款资产后处理尝试记录失败")
}
resp.Total = total
if total == 0 {
return resp, nil
}
var rows []model.RefundPostProcessAttempt
if err := query.Order("created_at DESC, id DESC").Offset((page - 1) * size).Limit(size).Find(&rows).Error; err != nil {
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询退款资产后处理尝试记录失败")
}
for _, row := range rows {
resp.Items = append(resp.Items, dto.RefundPostProcessAttemptItem{
ID: row.ID, RefundID: row.RefundID, RefundNo: row.RefundNo, Step: row.Step, AssetType: row.AssetType,
AssetID: row.AssetID, ICCID: row.ICCID, Attempt: row.Attempt, Trigger: row.Trigger, Result: row.Result,
ErrorCode: row.ErrorCode, ErrorMessage: row.ErrorMessage, DurationMS: row.DurationMS, CreatedAt: row.CreatedAt,
})
}
return resp, nil
}
func parseAttemptTime(value string) (time.Time, error) {
location := cardflow.ShanghaiDate(time.Now()).Location()
for _, layout := range attemptTimeLayouts {
if t, err := time.ParseInLocation(layout, value, location); err == nil {
return t, nil
}
}
return time.Time{}, errors.New(errors.CodeInvalidParam, "时间格式无效")
}

View File

@@ -268,6 +268,7 @@ func (s *Service) List(ctx context.Context, req *dto.RefundListRequest) (*dto.Re
OrderID: req.OrderID,
ShopID: req.ShopID,
AssetIdentifier: req.AssetIdentifier,
AssetPostStatus: req.AssetPostStatus,
}
requests, total, err := s.refundStore.List(ctx, opts, filters)
@@ -1375,6 +1376,10 @@ func buildRefundResponse(r *model.RefundRequest) *dto.RefundResponse {
Remark: r.Remark,
CommissionDeducted: r.CommissionDeducted,
AssetReset: r.AssetReset,
AssetPostStatus: r.AssetPostStatus,
AssetPostAttempts: r.AssetPostAttempts,
AssetPostLastError: r.AssetPostLastError,
AssetPostNextAt: r.AssetPostNextAt,
SubmitterID: r.Creator,
ApprovalInstanceID: r.ApprovalInstanceID,
Creator: r.Creator,