fix(core): add payment_id as query param in merchant return url (#6665)

fix(core): add payment_id as query param in merchant return url (#6665) #6037