Will fly to shanghai from US, then cruise to Japan fly back to US from Tokyo 04/2018

We will stay in Shanghai 2 days prior the Norwegian Jewel cruise embark on 4/16 cruise to -->Beijing 4/18-4/19 then -->Dalian 4/21 -->Sakaiminato, Japan--> .....disembark Yokohama, Japan 4/28
We will purchase a Beijing and Dalian group tour/excursion from the cruise ship. Do we need China visa or are we eligible for 15 day or 144 hours waiver visa? Would you send us the link or document to apply.