Glasgow - Amsterdam - Shanghai - Tokyo and back the same way?

Hi, we are Bulgarian passport holders, living in the UK. Our trip is as follows:
Glasgow - Amsterdam - Shanghai arriving on 8.06, staying in Shanghai 3 days and then a flight Shanghai - Tokyo on 11.06.
Styaing in Tokyo by 18.06 and then back to Shanghai on 18.06, staying 5 days there and leaving on 23.06 through Shanghai - Amsterdam - Glasgow.
As we are staying less than 144 hrs both times in Shanghai, are we eligible for 144 visa free stay? Does it matter that we are staying in Shanghai twice over such short period?