新增字段
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 8m15s

This commit is contained in:
2026-05-13 17:50:21 +08:00
parent a5388446d3
commit 81aa3c2b11
2 changed files with 7 additions and 0 deletions

View File

@@ -736,17 +736,20 @@ func (s *Service) GetPackages(ctx context.Context, assetType string, id uint, pa
metrics := u.BuildTrafficMetrics()
pkgName := u.PackageName
pkgType := ""
expiryBase := ""
if pkg != nil {
if pkgName == "" {
pkgName = pkg.PackageName
}
pkgType = pkg.PackageType
expiryBase = pkg.ExpiryBase
}
item := &dto.AssetPackageResponse{
PackageUsageID: u.ID,
PackageID: u.PackageID,
PackageName: pkgName,
PackageType: pkgType,
ExpiryBase: expiryBase,
OrderID: u.OrderID,
OrderNo: u.OrderNo,
RefundID: u.RefundID,
@@ -815,17 +818,20 @@ func (s *Service) GetCurrentPackage(ctx context.Context, assetType string, id ui
metrics := usage.BuildTrafficMetrics()
pkgName := usage.PackageName
pkgType := ""
expiryBase := ""
if pkgErr == nil && pkg != nil {
if pkgName == "" {
pkgName = pkg.PackageName
}
pkgType = pkg.PackageType
expiryBase = pkg.ExpiryBase
}
return &dto.AssetPackageResponse{
PackageUsageID: usage.ID,
PackageID: usage.PackageID,
PackageName: pkgName,
PackageType: pkgType,
ExpiryBase: expiryBase,
OrderID: usage.OrderID,
OrderNo: usage.OrderNo,
RefundID: usage.RefundID,