Flight to Japan through China - Can I enjoy visa free policy twice?

I am planning two weeks stay in Japan later this year. My first flight is supposed to ho through Shanghai, I suppose I can enjoy the free entry for two nights flying from Amsterdam and continuing to Tokyo by direct flights. My question is - if I arrange for the air ticket on my way back which would allow me to stay for two nights in Beijing (Flying from Tokyo to Beijing and then to Paris), can I enjoy the free entry again, just 12 days after the the first one in Shanghai?