We arrive in Shanghai on 3 June by air and transfer to ship same day for 16 day cruise to Japan.

However we return to Shanghai for 1 day in middle of cruise and return to Japan ports for remainder of cruise. We finish cruise on 19 June back in Shanghai and transfer to airport later that day for flight home to Australia. What is the visa requirement?