From 4f4e42f27e01e18ec8e0eb805d7308a60223cdec Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 29 Apr 2026 16:19:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E5=BD=93=E8=BF=94=E5=9B=9E=E7=9C=9F?= =?UTF-8?q?=E6=B5=81=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/handler/app/client_asset.go | 108 +++++++++++++-------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/internal/handler/app/client_asset.go b/internal/handler/app/client_asset.go index 678b3f7..dec1331 100644 --- a/internal/handler/app/client_asset.go +++ b/internal/handler/app/client_asset.go @@ -152,48 +152,48 @@ func (h *ClientAssetHandler) GetAssetInfo(c *fiber.Ctx) error { phone, _ := middleware.GetCustomerPhone(c) resp := &dto.AssetInfoResponse{ - BoundPhone: phone, - AssetType: resolved.Asset.AssetType, - AssetID: resolved.Asset.AssetID, - Identifier: resolved.Identifier, - VirtualNo: resolved.Asset.VirtualNo, - Status: resolved.Asset.Status, - StatusName: resolved.Asset.StatusName, - RealNameStatus: resolved.Asset.RealNameStatus, - RealNameStatusName: constants.GetRealNameStatusName(resolved.Asset.RealNameStatus), - CarrierName: resolved.Asset.CarrierName, - Generation: strconv.Itoa(resolved.Generation), - WalletBalance: resolved.WalletBalance, - ActivatedAt: resolved.Asset.ActivatedAt, - CurrentPackage: resolved.Asset.CurrentPackage, + BoundPhone: phone, + AssetType: resolved.Asset.AssetType, + AssetID: resolved.Asset.AssetID, + Identifier: resolved.Identifier, + VirtualNo: resolved.Asset.VirtualNo, + Status: resolved.Asset.Status, + StatusName: resolved.Asset.StatusName, + RealNameStatus: resolved.Asset.RealNameStatus, + RealNameStatusName: constants.GetRealNameStatusName(resolved.Asset.RealNameStatus), + CarrierName: resolved.Asset.CarrierName, + Generation: strconv.Itoa(resolved.Generation), + WalletBalance: resolved.WalletBalance, + ActivatedAt: resolved.Asset.ActivatedAt, + CurrentPackage: resolved.Asset.CurrentPackage, CurrentPackageUsageID: resolved.Asset.CurrentPackageUsageID, RealTotalMB: resolved.Asset.RealTotalMB, RealUsedMB: resolved.Asset.RealUsedMB, VirtualTotalMB: resolved.Asset.VirtualTotalMB, VirtualUsedMB: resolved.Asset.VirtualUsedMB, ReductionPct: resolved.Asset.ReductionPct, - DeviceName: resolved.Asset.DeviceName, - IMEI: resolved.Asset.IMEI, - SN: resolved.Asset.SN, - DeviceModel: resolved.Asset.DeviceModel, - DeviceType: resolved.Asset.DeviceType, - Manufacturer: resolved.Asset.Manufacturer, - MaxSimSlots: resolved.Asset.MaxSimSlots, - BoundCardCount: resolved.Asset.BoundCardCount, - Cards: resolved.Asset.Cards, - DeviceProtectStatus: resolved.Asset.DeviceProtectStatus, - ICCID: resolved.Asset.ICCID, - MSISDN: resolved.Asset.MSISDN, - CarrierID: resolved.Asset.CarrierID, - CarrierType: resolved.Asset.CarrierType, - NetworkStatus: resolved.Asset.NetworkStatus, - NetworkStatusName: constants.GetNetworkStatusName(resolved.Asset.NetworkStatus), - ActivationStatus: resolved.Asset.ActivationStatus, - ActivationStatusName: constants.GetActivationStatusName(resolved.Asset.ActivationStatus), - CardCategory: resolved.Asset.CardCategory, - BoundDeviceID: resolved.Asset.BoundDeviceID, - BoundDeviceNo: resolved.Asset.BoundDeviceNo, - BoundDeviceName: resolved.Asset.BoundDeviceName, + DeviceName: resolved.Asset.DeviceName, + IMEI: resolved.Asset.IMEI, + SN: resolved.Asset.SN, + DeviceModel: resolved.Asset.DeviceModel, + DeviceType: resolved.Asset.DeviceType, + Manufacturer: resolved.Asset.Manufacturer, + MaxSimSlots: resolved.Asset.MaxSimSlots, + BoundCardCount: resolved.Asset.BoundCardCount, + Cards: resolved.Asset.Cards, + DeviceProtectStatus: resolved.Asset.DeviceProtectStatus, + ICCID: resolved.Asset.ICCID, + MSISDN: resolved.Asset.MSISDN, + CarrierID: resolved.Asset.CarrierID, + CarrierType: resolved.Asset.CarrierType, + NetworkStatus: resolved.Asset.NetworkStatus, + NetworkStatusName: constants.GetNetworkStatusName(resolved.Asset.NetworkStatus), + ActivationStatus: resolved.Asset.ActivationStatus, + ActivationStatusName: constants.GetActivationStatusName(resolved.Asset.ActivationStatus), + CardCategory: resolved.Asset.CardCategory, + BoundDeviceID: resolved.Asset.BoundDeviceID, + BoundDeviceNo: resolved.Asset.BoundDeviceNo, + BoundDeviceName: resolved.Asset.BoundDeviceName, } // 调用服务层获取设备实时 Gateway 数据（per D-11） @@ -355,23 +355,23 @@ func (h *ClientAssetHandler) GetPackageHistory(c *fiber.Ctx) error { } list = append(list, dto.AssetPackageResponse{ - PackageUsageID: usage.ID, - PackageID: usage.PackageID, - PackageName: pkgName, - PackageType: pkgType, - UsageType: usage.UsageType, - Status: usage.Status, - StatusName: packageStatusName(usage.Status), - RealTotalMB: metrics.RealTotalMB, - RealUsedMB: metrics.RealUsedMB, - VirtualTotalMB: metrics.VirtualTotalMB, - VirtualUsedMB: metrics.VirtualUsedMB, - ReductionPct: metrics.ReductionPct, - ActivatedAt: usage.ActivatedAt, - ExpiresAt: usage.ExpiresAt, - MasterUsageID: usage.MasterUsageID, - Priority: usage.Priority, - CreatedAt: usage.CreatedAt, + PackageUsageID: usage.ID, + PackageID: usage.PackageID, + PackageName: pkgName, + PackageType: pkgType, + UsageType: usage.UsageType, + Status: usage.Status, + StatusName: packageStatusName(usage.Status), + RealTotalMB: metrics.RealTotalMB, + RealUsedMB: metrics.RealUsedMB, + VirtualTotalMB: metrics.VirtualTotalMB, + VirtualUsedMB: metrics.VirtualUsedMB, + ReductionPct: metrics.ReductionPct, + ActivatedAt: usage.ActivatedAt, + ExpiresAt: usage.ExpiresAt, + MasterUsageID: usage.MasterUsageID, + Priority: usage.Priority, + CreatedAt: usage.CreatedAt, }) } @@ -562,7 +562,7 @@ func buildClientPackageItem( validityDays = pkg.DurationMonths * 30 } - dataAllowance := pkg.VirtualDataMB + dataAllowance := pkg.RealDataMB if dataAllowance <= 0 { dataAllowance = pkg.RealDataMB }