feat: 卡流量读数先过采集队列再入账,扣减按采集时刻确定套餐
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m27s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m27s
- 每卡 Redis 采集队列(默认 N=3、跨天清空、回退容差 1 MB),攒满且不下降才写最后一个点 - 测试环境全量切换日快照计量,下线灰度名单、切换水位与卡表基线扣费;全部卡置待建起点 - 读数区分没给值与 0;有套餐的卡读数 0 也写快照与日用量 0 行;重置日比较基准为 0 照常防旧值 - 新增采集记录(按月分区保留 90 天)、人工冲正流水与后台接口、采集告警 - 扣减按采集时刻有效套餐查找,只对生效中套餐做状态迁移,查不到套餐按成功跳过 - 换货新卡(新设备下的卡)打待建起点;采集间隔上限只校验启用中的轮询配置 Change: add-card-traffic-queue-and-observed-deduction Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -28,6 +28,8 @@ type ConfigService struct {
|
||||
logger *zap.Logger
|
||||
configMgr *pollingcore.PollingConfigManager
|
||||
queueClient TaskEnqueuer
|
||||
// trafficQueueLimits 返回当前采集队列配置,用于校验启用中配置的流量采集间隔上限。
|
||||
trafficQueueLimits func(ctx context.Context) TrafficQueueLimits
|
||||
}
|
||||
|
||||
// SetAudit 注入轮询配置事务与统一审计 Writer。
|
||||
@@ -92,6 +94,9 @@ func (s *ConfigService) Create(ctx context.Context, req *dto.CreatePollingConfig
|
||||
if err := validatePollingConfig(config); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := s.validateTrafficInterval(ctx, config); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
err := runPollingTransaction(ctx, s.db, s.auditWriter, func(tx *gorm.DB) error {
|
||||
if err := s.configStore.WithTx(tx).Create(ctx, config); err != nil {
|
||||
@@ -211,6 +216,9 @@ func (s *ConfigService) Update(ctx context.Context, id uint, req *dto.UpdatePoll
|
||||
if err := validatePollingConfig(config); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := s.validateTrafficInterval(ctx, config); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
config.UpdatedBy = ¤tUserID
|
||||
|
||||
err = runPollingTransaction(ctx, s.db, s.auditWriter, func(tx *gorm.DB) error {
|
||||
@@ -343,6 +351,13 @@ func (s *ConfigService) UpdateStatus(ctx context.Context, id uint, status int16)
|
||||
}
|
||||
|
||||
before := pollingConfigState(config)
|
||||
if status == 1 {
|
||||
enabled := *config
|
||||
enabled.Status = status
|
||||
if err := s.validateTrafficInterval(ctx, &enabled); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
err = runPollingTransaction(ctx, s.db, s.auditWriter, func(tx *gorm.DB) error {
|
||||
if err := s.configStore.WithTx(tx).UpdateStatus(ctx, id, status, currentUserID); err != nil {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user