Skip to content

fix(account-invoices): Filter invoices with failed status and fix abnormal bill calculation #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HaiHui886 merged 1 commit into from
Jun 25, 2026
Merged

fix(account-invoices): Filter invoices with failed status and fix abnormal bill calculation #1205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions builder/store/database/account_invoices.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ func (a *accountInvoiceImpl) GetInvoiceByBillCycle(ctx context.Context, billCycl
Model(&invoice).
Where("bill_cycle = ?", billCycle).
Where("user_uuid =?", userUUID).
Where("status != ?", InvoiceStatusFailed).
Scan(ctx)
if err == sql.ErrNoRows {
return nil, nil
Expand Down Expand Up @@ -360,7 +361,7 @@ func (a *accountInvoiceImpl) GetInvoicableList(ctx context.Context, params Paged
With("mb", subQuery).
Column("mb.bill_cycle", "mb.invoice_amount").
Table("mb").
Where("NOT EXISTS (SELECT 1 FROM account_invoices AS account_invoice WHERE account_invoice.bill_cycle = mb.bill_cycle AND account_invoice.user_uuid = ?)", params.UserUUID).
Where("NOT EXISTS (SELECT 1 FROM account_invoices AS account_invoice WHERE account_invoice.bill_cycle = mb.bill_cycle AND account_invoice.user_uuid = ? AND account_invoice.status != ?)", params.UserUUID, InvoiceStatusFailed).
Order("mb.bill_cycle DESC")

if params.Page > 0 && params.PageSize > 0 {
Expand Down Expand Up @@ -438,7 +439,8 @@ func (a *accountInvoiceImpl) GetBillingSummary(ctx context.Context, params Billi
invoiceQuery := a.db.Core.NewSelect().
Model((*AccountInvoice)(nil)).
ColumnExpr("SUM(invoice_amount)").
Where("user_uuid = ?", params.UserUUID)
Where("user_uuid = ?", params.UserUUID).
Where("status != ?", InvoiceStatusFailed)

if params.StartMonth != "" {
invoiceQuery = invoiceQuery.Where("bill_cycle >= ?", params.StartMonth)
Expand All @@ -452,8 +454,13 @@ func (a *accountInvoiceImpl) GetBillingSummary(ctx context.Context, params Billi
return nil, err
}

// Calculate the uninvoiced amount
// Calculate the uninvoiced amount, ensure it never goes negative.
// Historical invoices created before the cash_value fix may have larger amounts
// than the current cash_value-based calculation, causing a negative result.
uninvoicedAmount := totalBillAmount - invoicedAmount
if uninvoicedAmount < 0 {
uninvoicedAmount = 0
}

return &BillingSummary{
CurrentMonthNonInvoicable: currentMonthNonInvoicable,
Expand Down
Loading