As a NZ citizen is a Visa required for a same day transit from one airline to another in Shanghai?

I understand I need to collect my bags from the Air NZ flight, go through China's immigration and then go to a different air terminal to catch a Air France flight about three hours after the original flight lands.
Will a Visa be reauired for this short transit stop of less than four hours?