Free visa ??

Iam flying to shanghai on 9th November arriving 10th for two nights before boarding a cruise ship which visits japan. I then return to Shanghai on 17th to fly home to manchester on the same day. Iam so confused whether I need a visa or can have free transit? Can anyone help?