diff --git a/backend/internal/modules/adminfinance/disbursement_list.go b/backend/internal/modules/adminfinance/disbursement_list.go index f9276d3..c42e5b3 100644 --- a/backend/internal/modules/adminfinance/disbursement_list.go +++ b/backend/internal/modules/adminfinance/disbursement_list.go @@ -136,7 +136,7 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context) *gorm.DB { pickupAdjustments := db.Table("admin_pickup_financial_adjustments AS fa"). Select(`'pickup_adjustment' AS source_type, fa.id AS source_id, - CAST(fa.id AS CHAR) AS business_no, + CONCAT(ap.pickup_no, '-ADJ-', fa.id) AS business_no, 0 AS order_id, 0 AS withdrawal_id, ap.owner_id AS user_id, diff --git a/backend/internal/modules/adminfinance/disbursement_list_test.go b/backend/internal/modules/adminfinance/disbursement_list_test.go index f7292dc..9b7ac6d 100644 --- a/backend/internal/modules/adminfinance/disbursement_list_test.go +++ b/backend/internal/modules/adminfinance/disbursement_list_test.go @@ -166,6 +166,16 @@ func TestDisbursementListCombinesPlatformSettlementsAndWithdrawals(t *testing.T) if pickupItem == nil || pickupItem.SourceType != "pickup" || pickupItem.ActualAmountCent != 4000 { t.Fatalf("线下提号出款信息不正确: %+v", pickupItem) } + var adjustmentItem *DisbursementItemDTO + for index := range result.Items { + if result.Items[index].SourceType == "pickup_adjustment" { + adjustmentItem = &result.Items[index] + break + } + } + if adjustmentItem == nil || adjustmentItem.BusinessNo != "P202607010001-ADJ-31" || adjustmentItem.ActualAmountCent != 500 { + t.Fatalf("提号调整出款信息不正确: %+v", adjustmentItem) + } var manualItem *DisbursementItemDTO for index := range result.Items {