Transit through China to Japan

Hi,

I'm a citizen of Kazakhstan. I want to travel to Japan through one of Chinese cities (most likely Beijing or Shanghai), I will have my tickets and bookings for my roundtrip to Japan. Do I need a visa if I'm staying for less than 24 hours or have a direct flight leaving in 3-4 hours after I arrive in Chinese airport?

Thanks!