Do we require visa or can we be transit?

We arrive by ship (mariner of the Seas) on the morning of June 18 and depart on June 20 with Singapore Airlines. We have already been to Shanghai in 2012 but just for a day. There seems to be some confusion whether we need a visa or transit. We are Australian citizens and our passports are up to date.