fix bug when merchant & user null
Merge branch 'master' of https://github.com/gumarusveritrans/ragnarok
Merge branch 'master' of https://github.com/gumarusveritrans/ragnarok