feat: 套餐系统升级 - Worker 重构、流量重置、文档与规范更新
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 6m54s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 6m54s
- 重构 Worker 启动流程,引入 bootstrap 模块统一管理依赖注入 - 实现套餐流量重置服务(日/月/年周期重置) - 新增套餐激活排队、加油包绑定、囤货待实名激活逻辑 - 新增订单创建幂等性防重(Redis 业务键 + 分布式锁) - 更新 AGENTS.md/CLAUDE.md:新增注释规范、幂等性规范,移除测试要求 - 添加套餐系统升级完整文档(API文档、使用指南、功能总结、运维指南) - 归档 OpenSpec package-system-upgrade 变更,同步 specs 到主目录 - 新增 queue types 抽象和 Redis 常量定义
This commit is contained in:
@@ -40,10 +40,11 @@ func CalculateExpiryTime(calendarType string, activatedAt time.Time, durationMon
|
||||
|
||||
// CalculateNextResetTime 计算下次流量重置时间
|
||||
// dataResetCycle: 流量重置周期(daily/monthly/yearly/none)
|
||||
// calendarType: 套餐周期类型(natural_month/by_day),影响月重置逻辑
|
||||
// currentTime: 当前时间
|
||||
// billingDay: 计费日(月重置时使用,联通=27,其他=1)
|
||||
// activatedAt: 套餐激活时间(按天套餐月重置时使用)
|
||||
// 返回:下次重置时间(00:00:00)
|
||||
func CalculateNextResetTime(dataResetCycle string, currentTime time.Time, billingDay int) *time.Time {
|
||||
func CalculateNextResetTime(dataResetCycle, calendarType string, currentTime, activatedAt time.Time) *time.Time {
|
||||
if dataResetCycle == constants.PackageDataResetNone {
|
||||
// 不重置
|
||||
return nil
|
||||
@@ -63,46 +64,49 @@ func CalculateNextResetTime(dataResetCycle string, currentTime time.Time, billin
|
||||
)
|
||||
|
||||
case constants.PackageDataResetMonthly:
|
||||
// 月重置:下月 billingDay 号 00:00:00
|
||||
year := currentTime.Year()
|
||||
month := currentTime.Month()
|
||||
if calendarType == constants.PackageCalendarTypeNaturalMonth {
|
||||
// 自然月套餐:每月1号 00:00:00 重置
|
||||
year := currentTime.Year()
|
||||
month := currentTime.Month()
|
||||
|
||||
// 检查 billingDay 是否为当前月的最后一天(月末计费的特殊情况)
|
||||
currentMonthLastDay := time.Date(year, month+1, 0, 0, 0, 0, 0, currentTime.Location()).Day()
|
||||
isBillingDayMonthEnd := billingDay >= currentMonthLastDay
|
||||
|
||||
// 如果当前日期 >= billingDay,则重置时间为下个月的 billingDay
|
||||
// 否则,重置时间为本月的 billingDay
|
||||
// 特殊情况:如果 billingDay 是月末,并且当前日期已接近月末,则跳到下个月
|
||||
shouldUseNextMonth := currentTime.Day() >= billingDay || (isBillingDayMonthEnd && currentTime.Day() >= currentMonthLastDay-1)
|
||||
|
||||
if shouldUseNextMonth {
|
||||
// 下个月
|
||||
month++
|
||||
if month > 12 {
|
||||
month = 1
|
||||
year++
|
||||
// 如果当前日期 >= 1号(即已过重置点),则下次重置为下个月1号
|
||||
if currentTime.Day() >= 1 {
|
||||
month++
|
||||
if month > 12 {
|
||||
month = 1
|
||||
year++
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 计算目标月份的最后一天(处理月末情况)
|
||||
lastDayOfMonth := time.Date(year, month+1, 0, 0, 0, 0, 0, currentTime.Location()).Day()
|
||||
resetDay := billingDay
|
||||
if billingDay > lastDayOfMonth {
|
||||
// 如果 billingDay 超过该月天数,使用月末
|
||||
resetDay = lastDayOfMonth
|
||||
}
|
||||
nextResetTime = time.Date(year, month, 1, 0, 0, 0, 0, currentTime.Location())
|
||||
} else {
|
||||
// 按天套餐:从激活日期开始,每30天重置一次
|
||||
// 计算从激活到现在经过了多少个30天周期
|
||||
daysSinceActivation := int(currentTime.Sub(activatedAt).Hours() / 24)
|
||||
cyclesPassed := daysSinceActivation / 30
|
||||
|
||||
nextResetTime = time.Date(year, month, resetDay, 0, 0, 0, 0, currentTime.Location())
|
||||
// 下次重置时间 = 激活时间 + (已过周期数+1) * 30天
|
||||
nextResetTime = activatedAt.AddDate(0, 0, (cyclesPassed+1)*30)
|
||||
nextResetTime = time.Date(
|
||||
nextResetTime.Year(),
|
||||
nextResetTime.Month(),
|
||||
nextResetTime.Day(),
|
||||
0, 0, 0, 0,
|
||||
nextResetTime.Location(),
|
||||
)
|
||||
}
|
||||
|
||||
case constants.PackageDataResetYearly:
|
||||
// 年重置:明年 1 月 1 日 00:00:00
|
||||
nextResetTime = time.Date(
|
||||
currentTime.Year()+1,
|
||||
1, 1,
|
||||
0, 0, 0, 0,
|
||||
currentTime.Location(),
|
||||
)
|
||||
// 年重置:每年1月1日 00:00:00
|
||||
year := currentTime.Year()
|
||||
|
||||
// 如果当前日期已经过了1月1日,则使用明年
|
||||
jan1ThisYear := time.Date(year, 1, 1, 0, 0, 0, 0, currentTime.Location())
|
||||
if currentTime.After(jan1ThisYear) || currentTime.Equal(jan1ThisYear) {
|
||||
year++
|
||||
}
|
||||
|
||||
nextResetTime = time.Date(year, 1, 1, 0, 0, 0, 0, currentTime.Location())
|
||||
|
||||
default:
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user