diff --git a/dao/sim_dao.go b/dao/sim_dao.go index 123c7db..d3b2237 100644 --- a/dao/sim_dao.go +++ b/dao/sim_dao.go @@ -20,8 +20,9 @@ func GetSimFlowExpendSum(db *sqlx.DB, iccid string, createdAtBegin, createdAtEnd sql := ` SELECT SUM( IF(flow_unit = 'KB', flow, - IF(flow_unit = 'MB', ROUND(flow * 1024)), + IF(flow_unit = 'MB', ROUND(flow * 1024), IF(flow_unit = "GB", ROUND(flow * 1024 * 1024), 0) + ) ) ) flow, icc_id, 'KB' flow_unit FROM sim_flow_expend @@ -41,8 +42,6 @@ func GetSimFlowExpendSum(db *sqlx.DB, iccid string, createdAtBegin, createdAtEnd sqlParams = append(sqlParams, createdAtEnd) } sql += " GROUP BY 2, 3" - fmt.Println(sql) - fmt.Println(sqlParams) if err = db.Select(&simFlowExpnds, sql, sqlParams); err == nil && len(simFlowExpnds) > 0 { return simFlowExpnds[0], err } @@ -56,8 +55,9 @@ func GetSimFlowIncomeSum(db *sqlx.DB, iccid string, createdAtBegin, createdAtEnd sql := ` SELECT SUM( IF(flow_unit = 'KB', flow, - IF(flow_unit = 'MB', ROUND(flow * 1024)), + IF(flow_unit = 'MB', ROUND(flow * 1024), IF(flow_unit = "GB", ROUND(flow * 1024 * 1024), 0) + ) ) ) flow, icc_id, 'KB' flow_unit FROM sim_flow_income diff --git a/services/sim.go b/services/sim.go index cee4435..b30991a 100644 --- a/services/sim.go +++ b/services/sim.go @@ -17,8 +17,8 @@ func SimFlowDaySettle() (err error) { var ( db = globals.GetDB() now = time.Now() - monthBegin = utils.Str2Time(utils.Int2Str(now.Year()) + "-" + utils.Int2Str(int(now.Month())) + "-01 00:00:00") - monthEnd = monthBegin.AddDate(0, 1, 0).AddDate(0, 0, -1) + monthBegin = utils.Str2Time(now.Format("2006-01") + "-01 00:00:00") + monthEnd = utils.Str2Time(monthBegin.AddDate(0, 1, 0).AddDate(0, 0, -1).Format("2006-01-02") + " 23:59:59") ) globals.SugarLogger.Debugf("SimFlowDaySettle Begin monthBegin %v, monthEnd %v", monthBegin, monthEnd) //月末好像不用算超不超了