fiee/micro-bundle
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-lzh' into dev

Browse Source
This commit is contained in:
lzh 2025-06-20 15:29:10 +08:00
commit b896c73fbb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/dao/bundleExtend.go
View File

@ -78,13 +78,18 @@ func GetBundleExtendRecordList(req *bundle.BundleExtendRecordsListRequest) (data
if req.Type != 0 { if req.Type != 0 {
session = session.Where("ber.`type` = ?", req.Type) 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 != "" { if req.AssociatedOrderNumber != "" {
session = session.Where("ber.associated_order_number like ?", "%"+req.AssociatedOrderNumber+"%") session = session.Where("ber.associated_order_number like ?", "%"+req.AssociatedOrderNumber+"%")
} }
if err = session.Count(&total).Error; err != nil { if err = session.Count(&total).Error; err != nil {
return return
} }
if req.Page != 0 && req.PageSize != 0 { if req.Page != 0 && req.PageSize != 0 {
session = session.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize)) session = session.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize))
} }