修改交易、积分返回的信息
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
merge code