You are not technically a transit passenger if your onward flight is to the point of origin. Functionally it might well be the same physical process but expect CX to enforce whatever the entry requirements are for Mainland China.