c端当前套餐开始时间过期时间,以及excel导入字段

2026-05-06 09:57:58 +08:00
parent ee7bfb81f0
commit 21b73a750d
9 changed files with 109 additions and 83 deletions
--- a/internal/handler/app/client_asset.go
+++ b/internal/handler/app/client_asset.go
@@ -152,48 +152,50 @@ 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,
-		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,
+		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,
+		CurrentPackageActivatedAt: resolved.Asset.CurrentPackageActivatedAt,
+		CurrentPackageExpiresAt:   resolved.Asset.CurrentPackageExpiresAt,
+		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,
 	}

 	// 调用服务层获取设备实时 Gateway 数据（per D-11）