From Canada to NZ on return stopping at Singapore and Shanghai then on to Canada

My husband and I will be on a round trip flight from Canada. We will be leaving Christchurch NZ stopping over in Singapore, SH and then on to Canada. Will the visa free stopover in SH apply on this return flight.