Australian Citizen on 8 day cruise from Singapore.

Hello, I am travelling by air to Singapore in March. From Singapore I will be joining cruise ship and travelling to Ho Chi Minh (Phu My), Hong Kong, Xiamen and final port will be Shanghai (Baoshan). Will be doing shore excursions in each port but not Staying longer than a few hours. We leave the ship in Shanghai (Baoshan) and after a small tour will be flying back to Australia via Shangai Pudong Airport. Do I need a Visa to enter China under these circumstances? If so then Which type do I require please?