feat: 分层轮询、重置日前加密与激活前流量结算
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m37s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m37s
- 轮询配置新增套餐状态、资产状态、重置日前窗口与窗口内流量间隔(迁移 248),间隔三态:正数按间隔、0 不检查、空继承 - 配置按 priority, id 排序合并;在库与已销售无套餐未匹配时告警不入队 - 新增优先级整体重排、匹配预览、立即重算到期时间(异步只提前)、分层统计与重置日前加密统计接口 - 已切换日快照计量的卡流量按观测时间归属,激活前用量只记已结算 - 订单购买与实名激活补齐资产级激活锁,激活前对已切换卡结算一次流量,失败只告警不阻塞,结算不触发通道阈值判定
This commit is contained in:
@@ -343,3 +343,62 @@ func applyPackageUsageCarrierFilter(query *gorm.DB, carrierType string, carrierI
|
||||
}
|
||||
return query
|
||||
}
|
||||
|
||||
// packageStateFromStatuses 按"生效中 > 已用完 > 待生效 > 无"把载体的套餐使用状态归并为分层轮询的套餐状态。
|
||||
func packageStateFromStatuses(statuses map[int]bool) string {
|
||||
switch {
|
||||
case statuses[constants.PackageUsageStatusActive]:
|
||||
return constants.PollingPackageStateActive
|
||||
case statuses[constants.PackageUsageStatusDepleted]:
|
||||
return constants.PollingPackageStateDepleted
|
||||
case statuses[constants.PackageUsageStatusPending]:
|
||||
return constants.PollingPackageStatePending
|
||||
default:
|
||||
return constants.PollingPackageStateNone
|
||||
}
|
||||
}
|
||||
|
||||
// PackageStateByCarrier 返回载体(卡或设备)的分层轮询套餐状态。
|
||||
func (s *PackageUsageStore) PackageStateByCarrier(ctx context.Context, carrierType string, carrierID uint) (string, error) {
|
||||
states, err := s.PackageStatesByCarriers(ctx, carrierType, []uint{carrierID})
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return states[carrierID], nil
|
||||
}
|
||||
|
||||
// PackageStatesByCarriers 批量返回同一类载体的分层轮询套餐状态;未出现在结果中的载体为无套餐。
|
||||
func (s *PackageUsageStore) PackageStatesByCarriers(ctx context.Context, carrierType string, carrierIDs []uint) (map[uint]string, error) {
|
||||
result := make(map[uint]string, len(carrierIDs))
|
||||
if len(carrierIDs) == 0 {
|
||||
return result, nil
|
||||
}
|
||||
column := "iot_card_id"
|
||||
if carrierType == "device" {
|
||||
column = "device_id"
|
||||
}
|
||||
var rows []struct {
|
||||
CarrierID uint
|
||||
Status int
|
||||
}
|
||||
err := s.db.WithContext(ctx).Model(&model.PackageUsage{}).
|
||||
Select(column+" AS carrier_id, status").
|
||||
Where(column+" IN ?", carrierIDs).
|
||||
Where("status IN ?", []int{constants.PackageUsageStatusPending, constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}).
|
||||
Group(column + ", status").
|
||||
Scan(&rows).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
statuses := make(map[uint]map[int]bool, len(carrierIDs))
|
||||
for _, row := range rows {
|
||||
if statuses[row.CarrierID] == nil {
|
||||
statuses[row.CarrierID] = map[int]bool{}
|
||||
}
|
||||
statuses[row.CarrierID][row.Status] = true
|
||||
}
|
||||
for _, id := range carrierIDs {
|
||||
result[id] = packageStateFromStatuses(statuses[id])
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@ func (s *PollingConfigStore) ListEnabled(ctx context.Context) ([]*model.PollingC
|
||||
var configs []*model.PollingConfig
|
||||
if err := s.db.WithContext(ctx).
|
||||
Where("status = ?", 1).
|
||||
Order("priority ASC").
|
||||
Order("priority ASC, id ASC").
|
||||
Find(&configs).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user