diff --git a/internal/store/postgres/package_usage_store.go b/internal/store/postgres/package_usage_store.go index 91be31f..47dd859 100644 --- a/internal/store/postgres/package_usage_store.go +++ b/internal/store/postgres/package_usage_store.go @@ -172,17 +172,12 @@ func (s *PackageUsageStore) ResetDataUsage(ctx context.Context, id uint, lastRes }).Error } -// HasValidByCarrier 检查载体是否有有效套餐(status IN 待生效/生效中) -// 修复Bug1:通过 carrierType 动态切换 device_id / iot_card_id 查询 +// HasValidByCarrier 检查载体是否有有效套餐(仅 status = 生效中) // carrierType: "iot_card" 或 "device" func (s *PackageUsageStore) HasValidByCarrier(ctx context.Context, carrierType string, carrierID uint) (bool, error) { var count int64 - validStatuses := []int{ - constants.PackageUsageStatusPending, // 待生效 - constants.PackageUsageStatusActive, // 生效中 - } query := s.db.WithContext(ctx).Model(&model.PackageUsage{}). - Where("status IN ?", validStatuses) + Where("status = ?", constants.PackageUsageStatusActive) if carrierType == "device" { query = query.Where("device_id = ?", carrierID) } else {