修正数据

internal/service/asset/service.go

@@ -297,16 +297,21 @@ func (s *Service) fillPackageInfo(ctx context.Context, resp *dto.AssetResolveRes
 		return
 	}
 
-	pkg, err := s.packageStore.GetByID(ctx, usage.PackageID)
-	if err != nil || pkg == nil {
-		return
+	resp.CurrentPackageUsageID = &usage.ID
+	resp.CurrentPackage = usage.PackageName
+	if resp.CurrentPackage == "" {
+		pkg, pkgErr := s.packageStore.GetByID(ctx, usage.PackageID)
+		if pkgErr == nil && pkg != nil {
+			resp.CurrentPackage = pkg.PackageName
+		}
 	}
 
-	resp.CurrentPackage = pkg.PackageName
-	ratio := safeVirtualRatio(pkg.VirtualRatio)
-	resp.PackageTotalMB = int64(float64(usage.DataLimitMB) / ratio)
-	resp.PackageUsedMB = float64(usage.DataUsageMB) / ratio
-	resp.PackageRemainMB = float64(usage.DataLimitMB-usage.DataUsageMB) / ratio
+	metrics := usage.BuildTrafficMetrics()
+	resp.RealTotalMB = metrics.RealTotalMB
+	resp.RealUsedMB = metrics.RealUsedMB
+	resp.VirtualTotalMB = metrics.VirtualTotalMB
+	resp.VirtualUsedMB = metrics.VirtualUsedMB
+	resp.ReductionPct = metrics.ReductionPct
 }
 
 // fillShopName 填充店铺名称
@@ -698,15 +703,14 @@ func (s *Service) GetPackages(ctx context.Context, assetType string, id uint, pa
 	all := make([]*dto.AssetPackageResponse, 0, len(usages))
 	for _, u := range usages {
 		pkg := pkgMap[u.PackageID]
-		ratio := 1.0
-		pkgName := ""
+		metrics := u.BuildTrafficMetrics()
+		pkgName := u.PackageName
 		pkgType := ""
-		enableVirtualData := false
 		if pkg != nil {
-			ratio = safeVirtualRatio(pkg.VirtualRatio)
-			pkgName = pkg.PackageName
+			if pkgName == "" {
+				pkgName = pkg.PackageName
+			}
 			pkgType = pkg.PackageType
-			enableVirtualData = pkg.EnableVirtualData
 		}
 		item := &dto.AssetPackageResponse{
 			PackageUsageID:    u.ID,
@@ -720,13 +724,11 @@ func (s *Service) GetPackages(ctx context.Context, assetType string, id uint, pa
 			UsageType:         u.UsageType,
 			Status:            u.Status,
 			StatusName:        packageStatusName(u.Status),
-			DataLimitMB:       u.DataLimitMB,
-			VirtualLimitMB:    int64(float64(u.DataLimitMB) / ratio),
-			DataUsageMB:       u.DataUsageMB,
-			VirtualUsedMB:     float64(u.DataUsageMB) / ratio,
-			VirtualRemainMB:   float64(u.DataLimitMB-u.DataUsageMB) / ratio,
-			VirtualRatio:      ratio,
-			EnableVirtualData: enableVirtualData,
+			RealTotalMB:       metrics.RealTotalMB,
+			RealUsedMB:        metrics.RealUsedMB,
+			VirtualTotalMB:    metrics.VirtualTotalMB,
+			VirtualUsedMB:     metrics.VirtualUsedMB,
+			ReductionPct:      metrics.ReductionPct,
 			ActivatedAt:       u.ActivatedAt,
 			ExpiresAt:         u.ExpiresAt,
 			MasterUsageID:     u.MasterUsageID,
@@ -779,15 +781,14 @@ func (s *Service) GetCurrentPackage(ctx context.Context, assetType string, id ui
 	}
 
 	pkg, pkgErr := s.packageStore.GetByID(ctx, usage.PackageID)
-	ratio := 1.0
-	pkgName := ""
+	metrics := usage.BuildTrafficMetrics()
+	pkgName := usage.PackageName
 	pkgType := ""
-	enableVirtualData := false
 	if pkgErr == nil && pkg != nil {
-		ratio = safeVirtualRatio(pkg.VirtualRatio)
-		pkgName = pkg.PackageName
+		if pkgName == "" {
+			pkgName = pkg.PackageName
+		}
 		pkgType = pkg.PackageType
-		enableVirtualData = pkg.EnableVirtualData
 	}
 	return &dto.AssetPackageResponse{
 		PackageUsageID:    usage.ID,
@@ -801,13 +802,11 @@ func (s *Service) GetCurrentPackage(ctx context.Context, assetType string, id ui
 		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,
-		EnableVirtualData: enableVirtualData,
+		RealTotalMB:       metrics.RealTotalMB,
+		RealUsedMB:        metrics.RealUsedMB,
+		VirtualTotalMB:    metrics.VirtualTotalMB,
+		VirtualUsedMB:     metrics.VirtualUsedMB,
+		ReductionPct:      metrics.ReductionPct,
 		ActivatedAt:       usage.ActivatedAt,
 		ExpiresAt:         usage.ExpiresAt,
 		MasterUsageID:     usage.MasterUsageID,
@@ -838,14 +837,6 @@ func nonZeroTimePtr(t time.Time) *time.Time {
 	return &t
 }
 
-// safeVirtualRatio 安全获取虚流量比例，避免除零
-func safeVirtualRatio(ratio float64) float64 {
-	if ratio <= 0 {
-		return 1.0
-	}
-	return ratio
-}
-
 // GetOrders 查询资产历史订单，支持换货链跨代追溯
 // page/pageSize 仅对本代订单生效；前代订单每代最多返回20条
 // 最多追溯10代，超出后 truncated=true