修复错误购买报错的问题,修复接口返回虚流量启动错误的问题

internal/handler/app/client_asset.go

@@ -63,16 +63,15 @@ func NewClientAssetHandler(
 }
 
 type resolvedAssetContext struct {
-	CustomerID           uint
-	Identifier           string
-	Asset                *dto.AssetResolveResponse
-	Generation           int
-	WalletBalance        int64
-	SkipPermissionCtx    context.Context
-	IsAgentChannel       bool
-	SellerShopID         uint
-	HasAddonMainPackage  bool
-	HasFormalMainPackage bool
+	CustomerID          uint
+	Identifier          string
+	Asset               *dto.AssetResolveResponse
+	Generation          int
+	WalletBalance       int64
+	SkipPermissionCtx   context.Context
+	IsAgentChannel      bool
+	SellerShopID        uint
+	HasAddonMainPackage bool
 }
 
 // resolveAssetFromIdentifier 统一执行资产解析与归属校验
@@ -243,16 +242,6 @@ func (h *ClientAssetHandler) GetAvailablePackages(c *fiber.Ctx) error {
 	} else if err != gorm.ErrRecordNotFound {
 		return errors.Wrap(errors.CodeDatabaseError, err, "查询主套餐失败")
 	}
-	if hasBlockingMain, err := packagepkg.HasBlockingMainPackageForFormal(
-		h.db.WithContext(resolved.SkipPermissionCtx),
-		resolved.Asset.AssetType,
-		resolved.Asset.AssetID,
-		time.Now(),
-	); err != nil {
-		return errors.Wrap(errors.CodeDatabaseError, err, "查询主套餐失败")
-	} else {
-		resolved.HasFormalMainPackage = hasBlockingMain
-	}
 
 	listCtx := resolved.SkipPermissionCtx
 	if resolved.IsAgentChannel {
@@ -376,23 +365,24 @@ 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,
+			EnableVirtualData: usage.EnableVirtualDataSnapshot,
+			ActivatedAt:       usage.ActivatedAt,
+			ExpiresAt:         usage.ExpiresAt,
+			MasterUsageID:     usage.MasterUsageID,
+			Priority:          usage.Priority,
+			CreatedAt:         usage.CreatedAt,
 		})
 	}
 
@@ -541,9 +531,6 @@ func buildClientPackageItem(
 	}
 
 	isAddon := pkg.PackageType == constants.PackageTypeAddon
-	if pkg.PackageType == constants.PackageTypeFormal && resolved.HasFormalMainPackage {
-		return dto.ClientPackageItem{}, false
-	}
 	if isAddon && !resolved.HasAddonMainPackage {
 		return dto.ClientPackageItem{}, false
 	}

internal/handler/openapi/handler.go

@@ -129,6 +129,10 @@ func (h *Handler) CreateWalletPackageOrders(c *fiber.Ctx) error {
 	if err != nil {
 		return err
 	}
+	if resp.FailedCount > 0 {
+		failure := resp.FailedCards[0]
+		return response.Business(c, failure.Code, resp, failure.Message)
+	}
 	return response.Success(c, resp)
 }