ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

fix(charge):修复用户充值部分的日期相关查询。

Browse Source
This commit is contained in:
徐涛 2023-06-08 21:40:54 +08:00
parent 40abbcfb8c
commit 33ccd7e0b6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
repository/charge.go
View File

@ -74,13 +74,13 @@ func (cr _ChargeRepository) FindCharges(page uint, beginTime, endTime *types.Dat
} }
if beginTime != nil { if beginTime != nil {
chargeQuery = chargeQuery.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.charge_to").Gte(*beginTime)) countQuery = countQuery.Where(goqu.I("c.created_at").Gte(beginTime.ToBeginningOfDate()))
} }
if endTime != nil { if endTime != nil {
chargeQuery = chargeQuery.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.charge_to").Lte(*endTime)) countQuery = countQuery.Where(goqu.I("c.created_at").Lte(endTime.ToEndingOfDate()))
} }
chargeQuery = chargeQuery.Order(goqu.I("c.created_at").Desc()) 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() countSql, countArgs, _ := countQuery.Prepared(true).ToSQL()
var ( var (
charges []*model.UserChargeDetail charges []*model.UserChargeDetail = make([]*model.UserChargeDetail, 0)
total int64 total int64
) )
if err := pgxscan.Select(ctx, global.DB, &charges, chargeSql, chargeArgs...); err != nil { if err := pgxscan.Select(ctx, global.DB, &charges, chargeSql, chargeArgs...); err != nil {