Do we need a visa?

We are flying from USA to Shanghai staying overnight and visiting someone in the City. We will be in Shanghai a total of 41 hours, then flying to Singapore to pick up a cruise ship. On the way back, we are flying to Shanghai from Singapore and staying in the airport several hours for our flight to the USA. Do we need entry permits? Thank you.