dachui/hfb_sys
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(order): 修复分销收号商品在主站租用后报订单不存在的问题

Browse Source
This commit is contained in:
yml2213
2026-09-09 15:24:56 +08:00
parent f6ad7c34ee
commit 02d091434e
7 changed files with 85 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/distribution/repository.go
+22 -6
View File
@@ -418,7 +418,7 @@ func (r *Repository) ListOrders(ctx context.Context, query DistributionOrderList
size = 100
}
base := r.db.WithContext(ctx).Table("rental_orders ro").
Joins("JOIN distribution_order_financials f ON f.order_id = ro.id").
Joins("LEFT JOIN distribution_order_financials f ON f.order_id = ro.id").
Joins("LEFT JOIN rental_listings rl ON rl.id = ro.listing_id").
Joins("LEFT JOIN game_accounts ga ON ga.id = ro.account_id").
Joins("LEFT JOIN users u ON u.id = ro.renter_id")
@@ -450,8 +450,16 @@ func (r *Repository) ListOrders(ctx context.Context, query DistributionOrderList
selectSQL := `
ro.id AS order_id, ro.order_no, ro.distribution_site_id AS site_id, ro.listing_id, ro.account_id, ro.owner_id, ro.renter_id,
ro.status, ro.handoff_status, ro.refund_status, ro.settlement_status, ro.distribution_mode,
f.gross_paid_amount_cent, f.refund_amount_cent, f.net_paid_amount_cent, f.payment_fee_cent, f.service_fee_cent,
f.markup_amount_cent, f.tax_amount_cent, f.split_base_amount_cent, f.rounding_adjustment_cent, ro.created_at,
COALESCE(f.gross_paid_amount_cent, 0) AS gross_paid_amount_cent,
COALESCE(f.refund_amount_cent, 0) AS refund_amount_cent,
COALESCE(f.net_paid_amount_cent, 0) AS net_paid_amount_cent,
COALESCE(f.payment_fee_cent, 0) AS payment_fee_cent,
COALESCE(f.service_fee_cent, 0) AS service_fee_cent,
COALESCE(f.markup_amount_cent, 0) AS markup_amount_cent,
COALESCE(f.tax_amount_cent, 0) AS tax_amount_cent,
COALESCE(f.split_base_amount_cent, 0) AS split_base_amount_cent,
COALESCE(f.rounding_adjustment_cent, 0) AS rounding_adjustment_cent,
ro.created_at,
COALESCE(rl.listing_no, '') AS listing_no,
COALESCE(ga.title, '') AS title,
COALESCE(ga.game_name, '') AS game_name,
@@ -518,8 +526,16 @@ func (r *Repository) FindOrder(ctx context.Context, adminID, id uint64) (*Distri
selectSQL := `
ro.id AS order_id, ro.order_no, ro.distribution_site_id AS site_id, ro.listing_id, ro.account_id, ro.owner_id, ro.renter_id,
ro.status, ro.handoff_status, ro.refund_status, ro.settlement_status, ro.distribution_mode,
f.gross_paid_amount_cent, f.refund_amount_cent, f.net_paid_amount_cent, f.payment_fee_cent, f.service_fee_cent,
f.markup_amount_cent, f.tax_amount_cent, f.split_base_amount_cent, f.rounding_adjustment_cent, ro.created_at,
COALESCE(f.gross_paid_amount_cent, 0) AS gross_paid_amount_cent,
COALESCE(f.refund_amount_cent, 0) AS refund_amount_cent,
COALESCE(f.net_paid_amount_cent, 0) AS net_paid_amount_cent,
COALESCE(f.payment_fee_cent, 0) AS payment_fee_cent,
COALESCE(f.service_fee_cent, 0) AS service_fee_cent,
COALESCE(f.markup_amount_cent, 0) AS markup_amount_cent,
COALESCE(f.tax_amount_cent, 0) AS tax_amount_cent,
COALESCE(f.split_base_amount_cent, 0) AS split_base_amount_cent,
COALESCE(f.rounding_adjustment_cent, 0) AS rounding_adjustment_cent,
ro.created_at,
COALESCE(rl.listing_no, '') AS listing_no,
COALESCE(ga.title, '') AS title,
COALESCE(ga.game_name, '') AS game_name,
@@ -535,7 +551,7 @@ func (r *Repository) FindOrder(ctx context.Context, adminID, id uint64) (*Distri
COALESCE(ro.deposit_amount_cent, 0) AS deposit_amount_cent
`
err := r.db.WithContext(ctx).Table("rental_orders ro").
Joins("JOIN distribution_order_financials f ON f.order_id = ro.id").
Joins("LEFT JOIN distribution_order_financials f ON f.order_id = ro.id").
Joins("LEFT JOIN rental_listings rl ON rl.id = ro.listing_id").
Joins("LEFT JOIN game_accounts ga ON ga.id = ro.account_id").
Joins("LEFT JOIN users u ON u.id = ro.renter_id").