feat: 记录查询列表补齐 ICCID、设备号、套餐名称、运营商名称与操作人
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 4m7s
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 4m7s
分页后按当前页 ID 批量查主键补齐展示字段,不在分页查询中关联,也不在记录表冗余: - 采集成功记录补 ICCID、运营商名称;采集失败、卡日流量补运营商名称 - 套餐日流量详单、冲正流水补套餐名称、ICCID、设备号与 IMEI - 冲正流水(含资产详情)补操作人用户名;退款后处理尝试记录补设备号与 IMEI
This commit is contained in:
@@ -11,6 +11,7 @@ import (
|
||||
"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/query/recorddisplay"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/middleware"
|
||||
@@ -182,9 +183,19 @@ func (s *Service) ListTrafficCollectionRecords(ctx context.Context, req *dto.Tra
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询采集成功记录失败")
|
||||
}
|
||||
successReq := recorddisplay.Request{}
|
||||
for _, row := range rows {
|
||||
successReq.CardIDs = append(successReq.CardIDs, row.IotCardID)
|
||||
successReq.CarrierIDs = append(successReq.CarrierIDs, row.CarrierID)
|
||||
}
|
||||
display, err := recorddisplay.Load(ctx, s.db, successReq)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, row := range rows {
|
||||
resp.Items = append(resp.Items, dto.TrafficCollectionRecordItem{
|
||||
CardTrafficCollectionItem: collectionSuccessItem(row), IotCardID: row.IotCardID, CarrierID: row.CarrierID,
|
||||
CardTrafficCollectionItem: collectionSuccessItem(row), IotCardID: row.IotCardID, ICCID: display.ICCID(row.IotCardID),
|
||||
CarrierID: row.CarrierID, CarrierName: display.CarrierName(row.CarrierID),
|
||||
})
|
||||
}
|
||||
resp.Total = total
|
||||
@@ -217,8 +228,18 @@ func (s *Service) ListTrafficCollectionFailures(ctx context.Context, req *dto.Tr
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询采集失败记录失败")
|
||||
}
|
||||
carrierIDs := make([]uint, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
resp.Items = append(resp.Items, collectionFailureItem(row))
|
||||
carrierIDs = append(carrierIDs, row.CarrierID)
|
||||
}
|
||||
display, err := recorddisplay.Load(ctx, s.db, recorddisplay.Request{CarrierIDs: carrierIDs})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, row := range rows {
|
||||
item := collectionFailureItem(row)
|
||||
item.CarrierName = display.CarrierName(row.CarrierID)
|
||||
resp.Items = append(resp.Items, item)
|
||||
}
|
||||
resp.Total = total
|
||||
return resp, nil
|
||||
@@ -257,10 +278,19 @@ func (s *Service) ListCardDailyUsages(ctx context.Context, req *dto.CardDailyUsa
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询卡日流量失败")
|
||||
}
|
||||
carrierIDs := make([]uint, 0, len(rows))
|
||||
for _, item := range rows {
|
||||
carrierIDs = append(carrierIDs, item.CarrierID)
|
||||
}
|
||||
display, err := recorddisplay.Load(ctx, s.db, recorddisplay.Request{CarrierIDs: carrierIDs})
|
||||
if err != nil {
|
||||
return nil, 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.FlowDate.Format(recordDateLayout), SettledMB: item.SettledMB, MonthUsedMB: item.MonthUsedMB,
|
||||
CarrierName: display.CarrierName(item.CarrierID),
|
||||
Date: item.FlowDate.Format(recordDateLayout), SettledMB: item.SettledMB, MonthUsedMB: item.MonthUsedMB,
|
||||
VendorUsedMB: item.VendorUsedMB, StaleGuarded: item.StaleGuarded, ObsCount: item.ObsCount, UpdatedAt: item.UpdatedAt,
|
||||
})
|
||||
}
|
||||
@@ -282,12 +312,13 @@ func (s *Service) ListPackageUsageDailyRecords(ctx context.Context, req *dto.Pac
|
||||
}
|
||||
type row struct {
|
||||
model.PackageUsageDailyRecord
|
||||
PackageID uint
|
||||
IotCardID uint
|
||||
DeviceID uint
|
||||
PackageID uint
|
||||
PackageName string
|
||||
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").
|
||||
Select("r.*, pu.package_id, pu.package_name, 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 {
|
||||
@@ -310,10 +341,21 @@ func (s *Service) ListPackageUsageDailyRecords(ctx context.Context, req *dto.Pac
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询套餐日流量详单失败")
|
||||
}
|
||||
dailyReq := recorddisplay.Request{}
|
||||
for _, item := range rows {
|
||||
dailyReq.CardIDs = append(dailyReq.CardIDs, item.IotCardID)
|
||||
dailyReq.DeviceIDs = append(dailyReq.DeviceIDs, item.DeviceID)
|
||||
}
|
||||
display, err := recorddisplay.Load(ctx, s.db, dailyReq)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, item := range rows {
|
||||
device := display.Device(item.DeviceID)
|
||||
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,
|
||||
ID: item.ID, PackageUsageID: item.PackageUsageID, PackageID: item.PackageID, PackageName: item.PackageName,
|
||||
IotCardID: item.IotCardID, ICCID: display.ICCID(item.IotCardID),
|
||||
DeviceID: item.DeviceID, DeviceVirtualNo: device.VirtualNo, DeviceIMEI: device.IMEI, Date: item.Date.Format(recordDateLayout), DailyUsageMB: item.DailyUsageMB,
|
||||
CumulativeUsageMB: item.CumulativeUsageMB, UpdatedAt: item.UpdatedAt,
|
||||
})
|
||||
}
|
||||
@@ -357,9 +399,25 @@ func (s *Service) ListPackageTrafficAdjustmentRecords(ctx context.Context, req *
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询套餐流量冲正流水失败")
|
||||
}
|
||||
adjReq := recorddisplay.Request{}
|
||||
for _, row := range rows {
|
||||
adjReq.CardIDs = append(adjReq.CardIDs, row.IotCardID)
|
||||
adjReq.DeviceIDs = append(adjReq.DeviceIDs, row.DeviceID)
|
||||
adjReq.OperatorIDs = append(adjReq.OperatorIDs, row.OperatorID)
|
||||
adjReq.PackageUsageIDs = append(adjReq.PackageUsageIDs, row.PackageUsageID)
|
||||
}
|
||||
display, err := recorddisplay.Load(ctx, s.db, adjReq)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, row := range rows {
|
||||
item := toTrafficAdjustmentItem(row)
|
||||
item.OperatorName = display.OperatorName(row.OperatorID)
|
||||
device := display.Device(row.DeviceID)
|
||||
resp.Items = append(resp.Items, dto.PackageTrafficAdjustmentRecordItem{
|
||||
PackageTrafficAdjustmentItem: toTrafficAdjustmentItem(row), IotCardID: row.IotCardID, DeviceID: row.DeviceID,
|
||||
PackageTrafficAdjustmentItem: item, PackageName: display.PackageName(row.PackageUsageID),
|
||||
IotCardID: row.IotCardID, ICCID: display.ICCID(row.IotCardID),
|
||||
DeviceID: row.DeviceID, DeviceVirtualNo: device.VirtualNo, DeviceIMEI: device.IMEI,
|
||||
})
|
||||
}
|
||||
resp.Total = total
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
stopresumedomain "github.com/break/junhong_cmp_fiber/internal/domain/stopresume"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||||
"github.com/break/junhong_cmp_fiber/internal/query/recorddisplay"
|
||||
"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"
|
||||
@@ -190,9 +191,19 @@ func (s *Service) ListPackageTrafficAdjustments(ctx context.Context, assetType s
|
||||
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, "查询冲正流水失败")
|
||||
}
|
||||
operatorIDs := make([]uint, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
operatorIDs = append(operatorIDs, row.OperatorID)
|
||||
}
|
||||
display, err := recorddisplay.Load(ctx, s.db, recorddisplay.Request{OperatorIDs: operatorIDs})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items := make([]dto.PackageTrafficAdjustmentItem, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
items = append(items, toTrafficAdjustmentItem(row))
|
||||
item := toTrafficAdjustmentItem(row)
|
||||
item.OperatorName = display.OperatorName(row.OperatorID)
|
||||
items = append(items, item)
|
||||
}
|
||||
return &dto.PackageTrafficAdjustmentListResponse{Items: items, Total: total}, nil
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"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/query/recorddisplay"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/middleware"
|
||||
@@ -72,10 +73,24 @@ func (s *Service) ListAssetPostProcessAttempts(ctx context.Context, req *dto.Ref
|
||||
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, "查询退款资产后处理尝试记录失败")
|
||||
}
|
||||
displayReq := recorddisplay.Request{}
|
||||
for _, row := range rows {
|
||||
if row.AssetType == constants.AssetTypeDevice {
|
||||
displayReq.DeviceIDs = append(displayReq.DeviceIDs, row.AssetID)
|
||||
}
|
||||
}
|
||||
display, err := recorddisplay.Load(ctx, s.db, displayReq)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, row := range rows {
|
||||
var device recorddisplay.Device
|
||||
if row.AssetType == constants.AssetTypeDevice {
|
||||
device = display.Device(row.AssetID)
|
||||
}
|
||||
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,
|
||||
AssetID: row.AssetID, ICCID: row.ICCID, DeviceVirtualNo: device.VirtualNo, DeviceIMEI: device.IMEI, Attempt: row.Attempt, Trigger: row.Trigger, Result: row.Result,
|
||||
ErrorCode: row.ErrorCode, ErrorMessage: row.ErrorMessage, DurationMS: row.DurationMS, CreatedAt: row.CreatedAt,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user