diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index b2b1e09..b66b05b 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -78,13 +78,18 @@ func GetBundleExtendRecordList(req *bundle.BundleExtendRecordsListRequest) (data if req.Type != 0 { session = session.Where("ber.`type` = ?", req.Type) } + if req.StartTime != 0 { + session = session.Where("ber.created_at >= ?", time.UnixMilli(int64(req.StartTime))) + } + if req.EndTime != 0 { + session = session.Where("ber.created_at <= ?", time.UnixMilli(int64(req.EndTime))) + } if req.AssociatedOrderNumber != "" { session = session.Where("ber.associated_order_number like ?", "%"+req.AssociatedOrderNumber+"%") } if err = session.Count(&total).Error; err != nil { return } - if req.Page != 0 && req.PageSize != 0 { session = session.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize)) }