This commit is contained in:
苏尹岚
2021-01-06 17:13:17 +08:00
parent 126b8679fe
commit f6a1edea5b

View File

@@ -1,6 +1,7 @@
package dao package dao
import ( import (
"fmt"
"time" "time"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
@@ -288,6 +289,8 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile
} }
sql += ` sql += `
) t4` ) t4`
fmt.Println(sql)
fmt.Println(sqlParams)
err = GetRow(db, &getPayStatisticsResult, sql, sqlParams) err = GetRow(db, &getPayStatisticsResult, sql, sqlParams)
sqlParams2 := []interface{}{} sqlParams2 := []interface{}{}
getPayStatisticsResult1 := &GetPayStatisticsResult{} getPayStatisticsResult1 := &GetPayStatisticsResult{}
@@ -307,6 +310,7 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile
LEFT JOIN user_bill c ON c.user_id = a.user_id LEFT JOIN user_bill c ON c.user_id = a.user_id
LEFT JOIN bill_expend d ON d.bill_id = c.bill_id AND d.type = ? LEFT JOIN bill_expend d ON d.bill_id = c.bill_id AND d.type = ?
` `
sqlParams2 = append(sqlParams2, model.BillTypeMember)
if fromTime != utils.ZeroTimeValue { if fromTime != utils.ZeroTimeValue {
sql2 += ` AND d.created_at > ?` sql2 += ` AND d.created_at > ?`
sqlParams2 = append(sqlParams2, fromTime) sqlParams2 = append(sqlParams2, fromTime)
@@ -318,7 +322,7 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile
sql2 += ` sql2 += `
WHERE a.status = ? AND a.deleted_at = ? WHERE a.status = ? AND a.deleted_at = ?
` `
sqlParams2 = append(sqlParams2, model.BillTypeMember, model.UserStatusNormal, utils.DefaultTimeValue) sqlParams2 = append(sqlParams2, model.UserStatusNormal, utils.DefaultTimeValue)
if len(cityCodes) > 0 { if len(cityCodes) > 0 {
sql2 += ` AND a.city_code IN ` + GenQuestionMarks(len(cityCodes)) + `)` sql2 += ` AND a.city_code IN ` + GenQuestionMarks(len(cityCodes)) + `)`
sqlParams2 = append(sqlParams2, cityCodes) sqlParams2 = append(sqlParams2, cityCodes)