csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

应当返回真流量
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m1s
Details

Browse Source
This commit is contained in:
huang
2026-04-29 16:19:15 +08:00
parent 6b3b33b2f0
commit 4f4e42f27e
1 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
internal/handler/app/client_asset.go
View File

@@ -152,48 +152,48 @@ func (h *ClientAssetHandler) GetAssetInfo(c *fiber.Ctx) error {
phone, _ := middleware.GetCustomerPhone(c) phone, _ := middleware.GetCustomerPhone(c)
resp := &dto.AssetInfoResponse{ resp := &dto.AssetInfoResponse{
BoundPhone: phone, BoundPhone: phone,
AssetType: resolved.Asset.AssetType, AssetType: resolved.Asset.AssetType,
AssetID: resolved.Asset.AssetID, AssetID: resolved.Asset.AssetID,
Identifier: resolved.Identifier, Identifier: resolved.Identifier,
VirtualNo: resolved.Asset.VirtualNo, VirtualNo: resolved.Asset.VirtualNo,
Status: resolved.Asset.Status, Status: resolved.Asset.Status,
StatusName: resolved.Asset.StatusName, StatusName: resolved.Asset.StatusName,
RealNameStatus: resolved.Asset.RealNameStatus, RealNameStatus: resolved.Asset.RealNameStatus,
RealNameStatusName: constants.GetRealNameStatusName(resolved.Asset.RealNameStatus), RealNameStatusName: constants.GetRealNameStatusName(resolved.Asset.RealNameStatus),
CarrierName: resolved.Asset.CarrierName, CarrierName: resolved.Asset.CarrierName,
Generation: strconv.Itoa(resolved.Generation), Generation: strconv.Itoa(resolved.Generation),
WalletBalance: resolved.WalletBalance, WalletBalance: resolved.WalletBalance,
ActivatedAt: resolved.Asset.ActivatedAt, ActivatedAt: resolved.Asset.ActivatedAt,
CurrentPackage: resolved.Asset.CurrentPackage, CurrentPackage: resolved.Asset.CurrentPackage,
CurrentPackageUsageID: resolved.Asset.CurrentPackageUsageID, CurrentPackageUsageID: resolved.Asset.CurrentPackageUsageID,
RealTotalMB: resolved.Asset.RealTotalMB, RealTotalMB: resolved.Asset.RealTotalMB,
RealUsedMB: resolved.Asset.RealUsedMB, RealUsedMB: resolved.Asset.RealUsedMB,
VirtualTotalMB: resolved.Asset.VirtualTotalMB, VirtualTotalMB: resolved.Asset.VirtualTotalMB,
VirtualUsedMB: resolved.Asset.VirtualUsedMB, VirtualUsedMB: resolved.Asset.VirtualUsedMB,
ReductionPct: resolved.Asset.ReductionPct, ReductionPct: resolved.Asset.ReductionPct,
DeviceName: resolved.Asset.DeviceName, DeviceName: resolved.Asset.DeviceName,
IMEI: resolved.Asset.IMEI, IMEI: resolved.Asset.IMEI,
SN: resolved.Asset.SN, SN: resolved.Asset.SN,
DeviceModel: resolved.Asset.DeviceModel, DeviceModel: resolved.Asset.DeviceModel,
DeviceType: resolved.Asset.DeviceType, DeviceType: resolved.Asset.DeviceType,
Manufacturer: resolved.Asset.Manufacturer, Manufacturer: resolved.Asset.Manufacturer,
MaxSimSlots: resolved.Asset.MaxSimSlots, MaxSimSlots: resolved.Asset.MaxSimSlots,
BoundCardCount: resolved.Asset.BoundCardCount, BoundCardCount: resolved.Asset.BoundCardCount,
Cards: resolved.Asset.Cards, Cards: resolved.Asset.Cards,
DeviceProtectStatus: resolved.Asset.DeviceProtectStatus, DeviceProtectStatus: resolved.Asset.DeviceProtectStatus,
ICCID: resolved.Asset.ICCID, ICCID: resolved.Asset.ICCID,
MSISDN: resolved.Asset.MSISDN, MSISDN: resolved.Asset.MSISDN,
CarrierID: resolved.Asset.CarrierID, CarrierID: resolved.Asset.CarrierID,
CarrierType: resolved.Asset.CarrierType, CarrierType: resolved.Asset.CarrierType,
NetworkStatus: resolved.Asset.NetworkStatus, NetworkStatus: resolved.Asset.NetworkStatus,
NetworkStatusName: constants.GetNetworkStatusName(resolved.Asset.NetworkStatus), NetworkStatusName: constants.GetNetworkStatusName(resolved.Asset.NetworkStatus),
ActivationStatus: resolved.Asset.ActivationStatus, ActivationStatus: resolved.Asset.ActivationStatus,
ActivationStatusName: constants.GetActivationStatusName(resolved.Asset.ActivationStatus), ActivationStatusName: constants.GetActivationStatusName(resolved.Asset.ActivationStatus),
CardCategory: resolved.Asset.CardCategory, CardCategory: resolved.Asset.CardCategory,
BoundDeviceID: resolved.Asset.BoundDeviceID, BoundDeviceID: resolved.Asset.BoundDeviceID,
BoundDeviceNo: resolved.Asset.BoundDeviceNo, BoundDeviceNo: resolved.Asset.BoundDeviceNo,
BoundDeviceName: resolved.Asset.BoundDeviceName, BoundDeviceName: resolved.Asset.BoundDeviceName,
} }
// 调用服务层获取设备实时 Gateway 数据（per D-11） // 调用服务层获取设备实时 Gateway 数据（per D-11）
@@ -355,23 +355,23 @@ func (h *ClientAssetHandler) GetPackageHistory(c *fiber.Ctx) error {
} }
list = append(list, dto.AssetPackageResponse{ list = append(list, dto.AssetPackageResponse{
PackageUsageID: usage.ID, PackageUsageID: usage.ID,
PackageID: usage.PackageID, PackageID: usage.PackageID,
PackageName: pkgName, PackageName: pkgName,
PackageType: pkgType, PackageType: pkgType,
UsageType: usage.UsageType, UsageType: usage.UsageType,
Status: usage.Status, Status: usage.Status,
StatusName: packageStatusName(usage.Status), StatusName: packageStatusName(usage.Status),
RealTotalMB: metrics.RealTotalMB, RealTotalMB: metrics.RealTotalMB,
RealUsedMB: metrics.RealUsedMB, RealUsedMB: metrics.RealUsedMB,
VirtualTotalMB: metrics.VirtualTotalMB, VirtualTotalMB: metrics.VirtualTotalMB,
VirtualUsedMB: metrics.VirtualUsedMB, VirtualUsedMB: metrics.VirtualUsedMB,
ReductionPct: metrics.ReductionPct, ReductionPct: metrics.ReductionPct,
ActivatedAt: usage.ActivatedAt, ActivatedAt: usage.ActivatedAt,
ExpiresAt: usage.ExpiresAt, ExpiresAt: usage.ExpiresAt,
MasterUsageID: usage.MasterUsageID, MasterUsageID: usage.MasterUsageID,
Priority: usage.Priority, Priority: usage.Priority,
CreatedAt: usage.CreatedAt, CreatedAt: usage.CreatedAt,
}) })
} }
@@ -562,7 +562,7 @@ func buildClientPackageItem(
validityDays = pkg.DurationMonths * 30 validityDays = pkg.DurationMonths * 30
} }
dataAllowance := pkg.VirtualDataMB dataAllowance := pkg.RealDataMB
if dataAllowance <= 0 { if dataAllowance <= 0 {
dataAllowance = pkg.RealDataMB dataAllowance = pkg.RealDataMB
} }