修复加油包独立有效期和流量重置
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 12m22s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 12m22s
This commit is contained in:
@@ -39,6 +39,16 @@ func CalculateExpiryTime(calendarType string, activatedAt time.Time, durationMon
|
||||
return expiryDate
|
||||
}
|
||||
|
||||
// CalculateAddonExpiryTime 计算加油包到期时间,并在主套餐更早到期时截断。
|
||||
// 返回值中的 independent 表示加油包自身有效期未晚于主套餐,因而按自身规则到期。
|
||||
func CalculateAddonExpiryTime(activatedAt time.Time, calendarType string, durationMonths, durationDays int, mainExpiresAt *time.Time) (expiresAt time.Time, independent bool) {
|
||||
addonExpiresAt := CalculateExpiryTime(calendarType, activatedAt, durationMonths, durationDays)
|
||||
if mainExpiresAt != nil && mainExpiresAt.Before(addonExpiresAt) {
|
||||
return *mainExpiresAt, false
|
||||
}
|
||||
return addonExpiresAt, true
|
||||
}
|
||||
|
||||
// CalculateValidityDays 计算套餐展示有效天数。
|
||||
// 按天套餐优先返回折算后的总天数;自然月套餐按 baseTime 推算到目标月月末。
|
||||
func CalculateValidityDays(calendarType string, baseTime time.Time, durationMonths, durationDays int) int {
|
||||
|
||||
Reference in New Issue
Block a user