修复加油包独立有效期和流量重置
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 4m22s

This commit is contained in:
2026-09-22 16:36:07 +08:00
parent 3610b776ca
commit c1c78d5008
4 changed files with 87 additions and 36 deletions

View File

@@ -2644,15 +2644,15 @@ func (s *Service) activateAddonPackage(ctx context.Context, tx *gorm.DB, order *
status := constants.PackageUsageStatusActive
activatedAt := now
// 计算过期时间(根据 has_independent_expiry)
var expiresAt time.Time
// 注意:has_independent_expiry 字段在 Package 模型中,暂时使用默认行为
// 默认加油包跟随主套餐过期
if mainPackage.ExpiresAt != nil {
expiresAt = *mainPackage.ExpiresAt
} else {
expiresAt = now
}
// 加油包按自身有效期计算;仅当主套餐更早到期时截断到主套餐到期时间。
expiresAt, hasIndependentExpiry := packagepkg.CalculateAddonExpiryTime(
activatedAt,
terms.CalendarType,
terms.DurationMonths,
terms.DurationDays,
mainPackage.ExpiresAt,
)
nextResetAt := packagepkg.CalculateNextResetTime(pkg.DataResetCycle, terms.CalendarType, now, activatedAt)
virtualTotalMBSnapshot, displayGainRatioSnapshot, enableVirtualDataSnapshot := model.BuildPackageUsageSnapshotValues(pkg)
addonRetailAmount := order.TotalAmount
@@ -2673,8 +2673,10 @@ func (s *Service) activateAddonPackage(ctx context.Context, tx *gorm.DB, order *
Status: status,
Priority: priority,
MasterUsageID: &mainPackage.ID,
HasIndependentExpiry: hasIndependentExpiry,
ActivatedAt: &activatedAt,
ExpiresAt: &expiresAt,
NextResetAt: nextResetAt,
DataResetCycle: pkg.DataResetCycle,
PaidAmount: &order.SellerCostPrice,
RetailAmount: &addonRetailAmount,