bug fix :判斷是否有優惠
Merge branch 'develop' into traction