csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

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

Browse Source
This commit is contained in:
huang
2026-05-13 17:50:21 +08:00
parent a5388446d3
commit 81aa3c2b11
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/model/dto/asset_dto.go
View File

@@ -108,6 +108,7 @@ type AssetPackageResponse struct {
PackageID uint `json:"package_id" description:"套餐ID"` PackageID uint `json:"package_id" description:"套餐ID"`
PackageName string `json:"package_name" description:"套餐名称"` PackageName string `json:"package_name" description:"套餐名称"`
PackageType string `json:"package_type" description:"套餐类型：formal/addon"` PackageType string `json:"package_type" description:"套餐类型：formal/addon"`
ExpiryBase string `json:"expiry_base,omitempty" description:"到期时间基准 (from_activation:实名激活时起算, from_purchase:购买时起算)"`
OrderID uint `json:"order_id" description:"关联订单ID（无订单分配时为0）"` OrderID uint `json:"order_id" description:"关联订单ID（无订单分配时为0）"`
OrderNo string `json:"order_no,omitempty" description:"订单号快照（无订单分配时为空）"` OrderNo string `json:"order_no,omitempty" description:"订单号快照（无订单分配时为空）"`
RefundID *uint `json:"refund_id,omitempty" description:"退款主键ID快照（未退款时为空）"` RefundID *uint `json:"refund_id,omitempty" description:"退款主键ID快照（未退款时为空）"`

6
internal/service/asset/service.go
View File

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