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

Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev

Browse Source
This commit is contained in:
jiaji.H 2026-02-04 09:48:32 +08:00
commit fe4357f246
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/dao/invoiceDao.go
View File

@ -100,7 +100,7 @@ func GetInvoiceList(req *bundle.GetInvoiceListReq) (data []*model.InvoiceInfo, t
COALESCE(pia.phone, user.tel_num) AS phone,
COALESCE(pia.country, rn.nationality) AS country,
COALESCE(pia.address, rn.place_of_residence) AS address,
COALESCE(pia.apply_time, invoice.apply_time) AS apply_time,
pia.apply_time AS apply_time,
invoice.user_name AS user_name,
invoice.user_num AS user_num,
invoice.order_no AS order_no,
@ -146,8 +146,8 @@ func GetInvoiceList(req *bundle.GetInvoiceListReq) (data []*model.InvoiceInfo, t
if req.UserName != "" {
query = query.Where("invoice.user_name LIKE ?", "%"+req.UserName+"%")
}
query.Order("pia.apply_time DESC")
query = query.Count(&total)
query.Order("invoice.apply_time DESC")
err = query.Offset(int(req.Page-1) * int(req.Size)).Limit(int(req.Size)).Find(&data).Error
if err != nil {
return nil, 0, err