See you can visit in one day also or two days depending on your comfert.
In amritsar golden temple and jallianwala bagh is just side by side which you can do first in morning time and then after having lunch at langar you can go to wagah border for the 3 o clock show and can comback by 7 o clock back to city.