I will arrive in Shanghai from Sydney staying 3 nights then flying onto Bangkok. I must return for 1

I will arrive in Shanghai from Sydney staying 3 nights then flying onto Bangkok for 10 nights, back to Shanghai one night to catch plane back to London, am I eligible both times to travel without a visa?