修正数据

internal/store/postgres/package_usage_store.go

@@ -212,6 +212,28 @@ func (s *PackageUsageStore) GetActiveOrDepletedByCarrier(ctx context.Context, ca
 	return &pkg, nil
 }
 
+// ListActiveOrDepletedByCarrier 查询载体下所有生效中或已用完套餐。
+func (s *PackageUsageStore) ListActiveOrDepletedByCarrier(ctx context.Context, carrierType string, carrierID uint) ([]*model.PackageUsage, error) {
+	var packages []*model.PackageUsage
+	query := s.db.WithContext(ctx).Model(&model.PackageUsage{}).
+		Where("status IN ?", []int{
+			constants.PackageUsageStatusActive,
+			constants.PackageUsageStatusDepleted,
+		}).
+		Order("CASE WHEN master_usage_id IS NOT NULL THEN 0 ELSE 1 END, priority ASC, activated_at ASC")
+
+	if carrierType == "device" {
+		query = query.Where("device_id = ?", carrierID)
+	} else {
+		query = query.Where("iot_card_id = ?", carrierID)
+	}
+
+	if err := query.Find(&packages).Error; err != nil {
+		return nil, err
+	}
+	return packages, nil
+}
+
 // ListByCarrier 查询载体的套餐使用记录（可按状态筛选）
 func (s *PackageUsageStore) ListByCarrier(ctx context.Context, carrierType string, carrierID uint, status *int) ([]*model.PackageUsage, error) {
 	var usages []*model.PackageUsage