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 6m58s
Details

Browse Source
This commit is contained in:
huang
2026-03-16 10:51:15 +08:00
parent 275debdd38
commit 907e500ffb
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,6 +75,7 @@ type PackageResponse struct {
RealDataMB int64 `json:"real_data_mb" description:"真流量额度(MB)"` RealDataMB int64 `json:"real_data_mb" description:"真流量额度(MB)"`
VirtualDataMB int64 `json:"virtual_data_mb" description:"虚流量额度(MB)"` VirtualDataMB int64 `json:"virtual_data_mb" description:"虚流量额度(MB)"`
EnableVirtualData bool `json:"enable_virtual_data" description:"是否启用虚流量"` EnableVirtualData bool `json:"enable_virtual_data" description:"是否启用虚流量"`
VirtualRatio float64 `json:"virtual_ratio" description:"虚流量比例(real_data_mb/virtual_data_mb)，启用虚流量时计算，否则为1.0"`
SuggestedRetailPrice int64 `json:"suggested_retail_price" description:"建议售价(分)"` SuggestedRetailPrice int64 `json:"suggested_retail_price" description:"建议售价(分)"`
CostPrice int64 `json:"cost_price" description:"成本价(分)"` CostPrice int64 `json:"cost_price" description:"成本价(分)"`
OneTimeCommissionAmount *int64 `json:"one_time_commission_amount,omitempty" description:"一次性佣金金额（分，代理视角）"` OneTimeCommissionAmount *int64 `json:"one_time_commission_amount,omitempty" description:"一次性佣金金额（分，代理视角）"`

2
internal/service/package/service.go
View File

@@ -514,6 +514,7 @@ func (s *Service) toResponse(ctx context.Context, pkg *model.Package) *dto.Packa
RealDataMB: pkg.RealDataMB, RealDataMB: pkg.RealDataMB,
VirtualDataMB: pkg.VirtualDataMB, VirtualDataMB: pkg.VirtualDataMB,
EnableVirtualData: pkg.EnableVirtualData, EnableVirtualData: pkg.EnableVirtualData,
VirtualRatio: calculateVirtualRatio(pkg.EnableVirtualData, pkg.RealDataMB, pkg.VirtualDataMB),
CostPrice: pkg.CostPrice, CostPrice: pkg.CostPrice,
SuggestedRetailPrice: pkg.SuggestedRetailPrice, SuggestedRetailPrice: pkg.SuggestedRetailPrice,
CalendarType: pkg.CalendarType, CalendarType: pkg.CalendarType,
@@ -578,6 +579,7 @@ func (s *Service) toResponseWithAllocation(_ context.Context, pkg *model.Package
RealDataMB: pkg.RealDataMB, RealDataMB: pkg.RealDataMB,
VirtualDataMB: pkg.VirtualDataMB, VirtualDataMB: pkg.VirtualDataMB,
EnableVirtualData: pkg.EnableVirtualData, EnableVirtualData: pkg.EnableVirtualData,
VirtualRatio: calculateVirtualRatio(pkg.EnableVirtualData, pkg.RealDataMB, pkg.VirtualDataMB),
CostPrice: pkg.CostPrice, CostPrice: pkg.CostPrice,
SuggestedRetailPrice: pkg.SuggestedRetailPrice, SuggestedRetailPrice: pkg.SuggestedRetailPrice,
CalendarType: pkg.CalendarType, CalendarType: pkg.CalendarType,