修正数据

internal/handler/app/client_asset.go

@@ -165,9 +165,12 @@ func (h *ClientAssetHandler) GetAssetInfo(c *fiber.Ctx) error {
 		WalletBalance:        resolved.WalletBalance,
 		ActivatedAt:          resolved.Asset.ActivatedAt,
 		CurrentPackage:       resolved.Asset.CurrentPackage,
-		PackageTotalMB:       resolved.Asset.PackageTotalMB,
-		PackageUsedMB:        resolved.Asset.PackageUsedMB,
-		PackageRemainMB:      resolved.Asset.PackageRemainMB,
+		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,
@@ -340,12 +343,13 @@ func (h *ClientAssetHandler) GetPackageHistory(c *fiber.Ctx) error {
 	list := make([]dto.AssetPackageResponse, 0, len(usages))
 	for _, usage := range usages {
 		pkg := packageMap[usage.PackageID]
-		ratio := 1.0
-		pkgName := ""
+		metrics := usage.BuildTrafficMetrics()
+		pkgName := usage.PackageName
 		pkgType := ""
 		if pkg != nil {
-			ratio = safeVirtualRatio(pkg.VirtualRatio)
-			pkgName = pkg.PackageName
+			if pkgName == "" {
+				pkgName = pkg.PackageName
+			}
 			pkgType = pkg.PackageType
 		}
 
@@ -357,12 +361,11 @@ func (h *ClientAssetHandler) GetPackageHistory(c *fiber.Ctx) error {
 			UsageType:       usage.UsageType,
 			Status:          usage.Status,
 			StatusName:      packageStatusName(usage.Status),
-			DataLimitMB:     usage.DataLimitMB,
-			VirtualLimitMB:  int64(float64(usage.DataLimitMB) / ratio),
-			DataUsageMB:     usage.DataUsageMB,
-			VirtualUsedMB:   float64(usage.DataUsageMB) / ratio,
-			VirtualRemainMB: float64(usage.DataLimitMB-usage.DataUsageMB) / ratio,
-			VirtualRatio:    ratio,
+			RealTotalMB:     metrics.RealTotalMB,
+			RealUsedMB:      metrics.RealUsedMB,
+			VirtualTotalMB:  metrics.VirtualTotalMB,
+			VirtualUsedMB:   metrics.VirtualUsedMB,
+			ReductionPct:    metrics.ReductionPct,
 			ActivatedAt:     usage.ActivatedAt,
 			ExpiresAt:       usage.ExpiresAt,
 			MasterUsageID:   usage.MasterUsageID,
@@ -581,13 +584,6 @@ func nonZeroTimePtr(t time.Time) *time.Time {
 	return &t
 }
 
-func safeVirtualRatio(ratio float64) float64 {
-	if ratio <= 0 {
-		return 1.0
-	}
-	return ratio
-}
-
 func packageStatusName(status int) string {
 	switch status {
 	case constants.PackageUsageStatusPending: