We are to travel from London back to NZ. We asked our travel agent for a 3 day stopover in Shanghai. Do we need a transit G visa?

We now find we actually have 85hrs (based on actual flight arrival and departure times). We will spend many of these additional hours upon arrival, travelling to accommodation and before departure.