What visa requirements will we need?

I am travelling to China - Shanghai from Australia arriving on 31st October & staying until 2nd Nov before boarding a cruise to Japan for seven days and returning to Shanghai on 9th before flights back to Australia later that day on 9th Nov.