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:
@@ -117,43 +117,48 @@ func (s *ResetService) resetMonthlyUsageWithDB(ctx context.Context, db *gorm.DB)
|
||||
return nil
|
||||
}
|
||||
|
||||
// 按套餐分组处理(因为需要区分联通27号 vs 其他1号)
|
||||
for _, pkg := range packages {
|
||||
// 查询运营商信息以确定计费日
|
||||
// 只有单卡套餐才根据运营商判断,设备级套餐统一使用1号计费
|
||||
billingDay := 1
|
||||
if pkg.IotCardID != 0 {
|
||||
var card model.IotCard
|
||||
if err := tx.First(&card, pkg.IotCardID).Error; err == nil {
|
||||
var carrier model.Carrier
|
||||
if err := tx.First(&carrier, card.CarrierID).Error; err == nil {
|
||||
if carrier.CarrierType == "CUCC" {
|
||||
billingDay = 27
|
||||
}
|
||||
}
|
||||
}
|
||||
// 按套餐分组处理(根据套餐周期类型计算下次重置时间)
|
||||
for _, usage := range packages {
|
||||
// 查询套餐信息,获取 calendar_type
|
||||
var pkg model.Package
|
||||
if err := tx.First(&pkg, usage.PackageID).Error; err != nil {
|
||||
s.logger.Error("查询套餐信息失败",
|
||||
zap.Uint("usage_id", usage.ID),
|
||||
zap.Uint("package_id", usage.PackageID),
|
||||
zap.Error(err))
|
||||
continue
|
||||
}
|
||||
// 设备级套餐默认使用1号计费(已在 billingDay := 1 初始化)
|
||||
|
||||
// 计算下次重置时间
|
||||
nextReset := calculateNextMonthlyResetTime(now, billingDay)
|
||||
// 计算下次重置时间(基于套餐周期类型)
|
||||
// 自然月套餐:每月1号重置
|
||||
// 按天套餐:每30天重置
|
||||
activatedAt := usage.ActivatedAt
|
||||
if activatedAt.IsZero() {
|
||||
activatedAt = now // 兜底处理
|
||||
}
|
||||
nextResetAt := CalculateNextResetTime(constants.PackageDataResetMonthly, pkg.CalendarType, now, activatedAt)
|
||||
if nextResetAt == nil {
|
||||
s.logger.Warn("计算下次重置时间失败",
|
||||
zap.Uint("usage_id", usage.ID))
|
||||
continue
|
||||
}
|
||||
|
||||
// 更新套餐
|
||||
updates := map[string]interface{}{
|
||||
"data_usage_mb": 0,
|
||||
"last_reset_at": now,
|
||||
"next_reset_at": nextReset,
|
||||
"next_reset_at": *nextResetAt,
|
||||
"status": constants.PackageUsageStatusActive, // 重置后恢复为生效中
|
||||
}
|
||||
|
||||
if err := tx.Model(pkg).Updates(updates).Error; err != nil {
|
||||
if err := tx.Model(usage).Updates(updates).Error; err != nil {
|
||||
return errors.Wrap(errors.CodeDatabaseError, err, "重置月流量失败")
|
||||
}
|
||||
|
||||
s.logger.Info("月流量已重置",
|
||||
zap.Uint("usage_id", pkg.ID),
|
||||
zap.Int("billing_day", billingDay),
|
||||
zap.Time("next_reset_at", nextReset))
|
||||
zap.Uint("usage_id", usage.ID),
|
||||
zap.String("calendar_type", pkg.CalendarType),
|
||||
zap.Time("next_reset_at", *nextResetAt))
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -217,26 +222,3 @@ func (s *ResetService) resetYearlyUsageWithDB(ctx context.Context, db *gorm.DB)
|
||||
})
|
||||
}
|
||||
|
||||
// calculateNextMonthlyResetTime 计算下次月重置时间
|
||||
func calculateNextMonthlyResetTime(now time.Time, billingDay int) time.Time {
|
||||
currentDay := now.Day()
|
||||
targetMonth := now.Month()
|
||||
targetYear := now.Year()
|
||||
|
||||
// 如果当前日期 >= 计费日,下次重置是下月计费日
|
||||
if currentDay >= billingDay {
|
||||
targetMonth++
|
||||
if targetMonth > 12 {
|
||||
targetMonth = 1
|
||||
targetYear++
|
||||
}
|
||||
}
|
||||
|
||||
// 处理月末天数不足的情况(例如2月没有27日)
|
||||
maxDay := time.Date(targetYear, targetMonth+1, 0, 0, 0, 0, 0, now.Location()).Day()
|
||||
if billingDay > maxDay {
|
||||
billingDay = maxDay
|
||||
}
|
||||
|
||||
return time.Date(targetYear, targetMonth, billingDay, 0, 0, 0, 0, now.Location())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user