Transit Visa when flying return through different city

Hi,
I plan to travel from Melbourne - Beijing (3 days) - Tokyo, then a couple weeks later fly back from Osaka - Shanghai - Melbourne. Will I still be granted a transit G in Beijing on my way to Japan? Does the stop over in destination "B" only apply for one way, or for return?

thank you in advance