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-03 09:26:41 +08:00
commit 14d0465e6d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/dao/invoiceDao.go
View File

@ -103,7 +103,11 @@ func GetInvoiceList(req *bundle.GetInvoiceListReq) (data []*model.InvoiceInfo, t
Joins("LEFT JOIN `micro-account`.real_name AS rn ON user.real_name_id = rn.id and rn.deleted_at = 0")
if req.IsExpress != 0 {
query = query.Where("invoice.paper_invocie_status = ?", req.IsExpress)
if req.IsExpress == 2 && req.IsApplyInvocice == 1 {
query = query.Where("invoice.paper_invocie_status = ?", req.IsApplyInvocice)
} else {
query = query.Where("invoice.paper_invocie_status = ?", req.IsExpress)
}
} else {
if req.IsApplyInvocice == 2 {
query = query.Where("invoice.paper_invocie_status >= ?", req.IsApplyInvocice)