modify recharge

controllers/funds.go

@@ -282,15 +282,15 @@ func (server *FundsController) IncomeAndExpense() {
 
 	countQB, _ := orm.NewQueryBuilder("mysql")
 	countQB.Select("count(*)").
-		From("funds")
+		From("funds").Where("uid != '0'")
 
 	queryQB, _ := orm.NewQueryBuilder("mysql")
 	queryQB.Select("*").
-		From("funds")
+		From("funds").Where("uid != '0'")
 
 	if info.Role != 1 && info.Role != 2 {
-		countQB.Where(fmt.Sprintf("uid = '%d'", info.UserID))
-		queryQB.Where(fmt.Sprintf("uid = '%d'", info.UserID))
+		countQB.And(fmt.Sprintf("uid = '%d'", info.UserID))
+		queryQB.And(fmt.Sprintf("uid = '%d'", info.UserID))
 	}
 
 	if appRequest.StartTime != "" && appRequest.EndTime != "" {
@@ -298,13 +298,8 @@ func (server *FundsController) IncomeAndExpense() {
 		startTime := fmt.Sprintf(temp.Format(format))
 		temp, _ = time.Parse(layout, appRequest.EndTime)
 		endTime := fmt.Sprintf(temp.Format(format))
-		if info.Role == 1 || info.Role == 2 {
-			countQB.Where(fmt.Sprintf("time >= '%s'", startTime)).And(fmt.Sprintf("time <= '%s'", endTime))
-			queryQB.Where(fmt.Sprintf("time >= '%s'", startTime)).And(fmt.Sprintf("time <= '%s'", endTime))
-		} else {
-			countQB.And(fmt.Sprintf("time >= '%s'", startTime)).And(fmt.Sprintf("time <= '%s'", endTime))
-			queryQB.And(fmt.Sprintf("time >= '%s'", startTime)).And(fmt.Sprintf("time <= '%s'", endTime))
-		}
+		countQB.And(fmt.Sprintf("time >= '%s'", startTime)).And(fmt.Sprintf("time <= '%s'", endTime))
+		queryQB.And(fmt.Sprintf("time >= '%s'", startTime)).And(fmt.Sprintf("time <= '%s'", endTime))
 	}
 	if appRequest.TradeType != 0 {
 		countQB.And(fmt.Sprintf("trade_type = %d", appRequest.TradeType))

libs/cronjob/cronjob.go

@@ -132,9 +132,11 @@ func startDebit() {
 		sql := fmt.Sprintf("SELECT time, uid,sum(fee) AS amount FROM bills WHERE time >= '%s' and time <= '%s' SAMPLE BY 1d ALIGN TO CALENDAR GROUP BY uid,time;", start, end)
 		data, err := postgres.CountFunds(sql)
 		if err != nil {
+			logs.Debug("startDebit postgres CountFunds = %s", err.Error())
 			return
 		}
 		if data == nil {
+			logs.Debug("startDebit data = nil")
 			return
 		}