Transit Visa or Tourist Visa?

Hi, my round trip ticket was for a 15 days stay in Hong Kong. I am planning to visit Macau and Beijing though. What kind of visa should I apply for, transit or tourist visa? And will I be questioned by China Embassy if they will see that my flight ticket was MNL - HK, HK - MNL? Thanks a lot.