修改pos现金券处理，以及增加pos现金券判断
merge code
merge code
去除多余常量
Merge branch '20131219-cpucard' of https://github.com/cardsystem/our-card-system into 20140314-datacenter
修改日志
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
Merge branch '20131219-cpucard' of https://github.com/cardsystem/our-card-system into 20140314-datacenter
修改配置
修正消费回调