Traveling to Shangahi and need help

My boyfriend and I plan on going to Asia in January We will be in Asia for two weeks with Shanghai being the first and Last stop. I read online that China will give you a visa if you plan on staying in China for less than 72 hours. We land in Shanghai, China January 7th at 4:00pm and fly out January 10th at 1:04am (31 hour duration in China) to travel to the Philippines. We will be in China for less than 72 hours when we land but when we fly back to the states we use Shanghai, China as our port to travel out. We land back in Shanghai January 18th, at 9:50am, and fly out January 19th at 5:50pm

Would we need entry permit?
We travel from Shanghai to Philippines to Bali then back to Shanghai for 8 hours and back to the US.