From 33ccd7e0b643a3b00bb6e39bdcb9cdc8012b42b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Thu, 8 Jun 2023 21:40:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(charge):=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=85=85=E5=80=BC=E9=83=A8=E5=88=86=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repository/charge.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/repository/charge.go b/repository/charge.go index 1857b66..573badb 100644 --- a/repository/charge.go +++ b/repository/charge.go @@ -74,13 +74,13 @@ func (cr _ChargeRepository) FindCharges(page uint, beginTime, endTime *types.Dat } if beginTime != nil { - chargeQuery = chargeQuery.Where(goqu.I("c.charge_to").Gte(*beginTime)) - countQuery = countQuery.Where(goqu.I("c.charge_to").Gte(*beginTime)) + chargeQuery = chargeQuery.Where(goqu.I("c.created_at").Gte(beginTime.ToBeginningOfDate())) + countQuery = countQuery.Where(goqu.I("c.created_at").Gte(beginTime.ToBeginningOfDate())) } if endTime != nil { - chargeQuery = chargeQuery.Where(goqu.I("c.charge_to").Lte(*endTime)) - countQuery = countQuery.Where(goqu.I("c.charge_to").Lte(*endTime)) + chargeQuery = chargeQuery.Where(goqu.I("c.created_at").Lte(endTime.ToEndingOfDate())) + countQuery = countQuery.Where(goqu.I("c.created_at").Lte(endTime.ToEndingOfDate())) } chargeQuery = chargeQuery.Order(goqu.I("c.created_at").Desc()) @@ -92,7 +92,7 @@ func (cr _ChargeRepository) FindCharges(page uint, beginTime, endTime *types.Dat countSql, countArgs, _ := countQuery.Prepared(true).ToSQL() var ( - charges []*model.UserChargeDetail + charges []*model.UserChargeDetail = make([]*model.UserChargeDetail, 0) total int64 ) if err := pgxscan.Select(ctx, global.DB, &charges, chargeSql, chargeArgs...); err != nil {