From f1281a9734d54466e225682fcd89add97f6354ec Mon Sep 17 00:00:00 2001 From: yml2213 Date: Fri, 4 Sep 2026 19:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E9=87=91=E5=87=BA?= =?UTF-8?q?=E6=AC=BE=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/modules/adminfinance/disbursement_list.go | 2 +- .../modules/adminfinance/disbursement_list_test.go | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) 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 {