From 5c18c56bda2dee4463cddf2ec5d546a7f88df384 Mon Sep 17 00:00:00 2001 From: zhora Date: Mon, 20 Oct 2025 17:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=85=85=E5=80=BC=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/backend/models/db.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/backend/models/db.go b/modules/backend/models/db.go index 9339dc4..a946863 100644 --- a/modules/backend/models/db.go +++ b/modules/backend/models/db.go @@ -1200,8 +1200,8 @@ func GetNewPayAmountBySqls(s, e int64, t common.CurrencyType, channel ...*int) i INNER JOIN (SELECT id from users where birth >= %d AND birth < %d) as u ON re.uid = u.id - WHERE event = %d AND status = %d and callback_time >= %d AND callback_time < %d and currency_type = %d`, - i, i+oneDay, common.CurrencyEventReCharge, common.StatusROrderPay, i, i+oneDay, t) + WHERE event in (%d,%d) AND status = %d and callback_time >= %d AND callback_time < %d and currency_type = %d`, + i, i+oneDay, common.CurrencyEventReCharge, common.CurrencyEventActivityWeekCard, common.StatusROrderPay, i, i+oneDay, t) if len(channel) > 0 { sql += PackChannels(channel...) } @@ -1257,8 +1257,8 @@ func GetOldPayCountBySqls(s, e int64, channel ...*int) int64 { INNER JOIN (SELECT id from users WHERE birth < %d)AS u ON re.uid = u.id - WHERE event = %d AND status = %d AND re.callback_time >= %d AND re.callback_time < %d AND event = %d`, - i, common.CurrencyEventReCharge, common.StatusROrderPay, i, i+oneDay, common.CurrencyEventReCharge) + WHERE event in (%d,%d) AND status = %d AND re.callback_time >= %d AND re.callback_time < %d AND event = %d`, + i, common.CurrencyEventReCharge, common.CurrencyEventActivityWeekCard, common.StatusROrderPay, i, i+oneDay, common.CurrencyEventReCharge) if len(channel) > 0 { sql += PackChannels(channel...) }