We arrive Shanghai by cruise ship from Japan on 15/4/17 at 6am

we leave the same day i.e the 15/4/17 at 10pm ,16 hours in all ,we then return to Japan ,i cant find a definitive answer to my question do i need a Visa ,Celebrity cruises say i doubt looking at your questions & answeres i wonder about this, as its going to cost us nearly £300
The cruise starts in hong Kong,& Taiwan ,which i no are Visa free ,can you help please
Margaret