fix bugs in billing model
Merge branch 'master' of https://github.com/flyjet/Nova_Miaas