新增其他线下出款记账

backend/internal/modules/adminfinance/disbursement_list.go

@@ -79,6 +79,12 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context) *gorm.DB {
 			ro.offline_settled_by AS operator_id,
 			COALESCE(NULLIF(operator.nickname, ''), operator.username, '') AS operator_name,
 			ro.offline_settlement_remark AS remark,
+			'' AS category,
+			'' AS voucher_url,
+			NULL AS voided_at,
+			NULL AS voided_by,
+			'' AS voided_by_name,
+			'' AS void_reason,
 			lu.parsed_payload AS source_payload`).
 		Joins(`LEFT JOIN listing_uploads AS lu ON lu.id = (
 			SELECT MAX(lu2.id) FROM listing_uploads AS lu2 WHERE lu2.listing_id = ro.listing_id
@@ -118,11 +124,52 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context) *gorm.DB {
 			COALESCE(wr.paid_by, wr.reviewed_by) AS operator_id,
 			COALESCE(NULLIF(operator.nickname, ''), operator.username, '') AS operator_name,
 			CASE WHEN wr.payment_remark <> '' THEN wr.payment_remark ELSE wr.review_remark END AS remark,
+			'' AS category,
+			'' AS voucher_url,
+			NULL AS voided_at,
+			NULL AS voided_by,
+			'' AS voided_by_name,
+			'' AS void_reason,
 			NULL AS source_payload`).
 		Joins("LEFT JOIN users AS u ON u.id = wr.user_id").
 		Joins("LEFT JOIN admin_users AS operator ON operator.id = COALESCE(wr.paid_by, wr.reviewed_by)")
 
-	union := db.Raw("? UNION ALL ?", platformManaged, withdrawal)
+	manualOffline := db.Table("manual_disbursements AS md").
+		Select(`'manual_offline' AS source_type,
+			md.id AS source_id,
+			md.disbursement_no AS business_no,
+			0 AS order_id,
+			0 AS withdrawal_id,
+			0 AS user_id,
+			md.payee_name,
+			'' AS payee_phone,
+			'' AS uploader_name,
+			'' AS source_channel,
+			'' AS account_type,
+			'' AS account_name,
+			'' AS account_no,
+			'' AS bank_name,
+			md.amount_cent,
+			0 AS fee_cent,
+			md.amount_cent AS actual_amount_cent,
+			md.status,
+			md.status AS raw_status,
+			md.created_at AS business_created_at,
+			md.paid_at,
+			md.created_by AS operator_id,
+			COALESCE(NULLIF(creator.nickname, ''), creator.username, '') AS operator_name,
+			md.remark,
+			md.category,
+			md.voucher_url,
+			md.voided_at,
+			md.voided_by,
+			COALESCE(NULLIF(voider.nickname, ''), voider.username, '') AS voided_by_name,
+			md.void_reason,
+			NULL AS source_payload`).
+		Joins("LEFT JOIN admin_users AS creator ON creator.id = md.created_by").
+		Joins("LEFT JOIN admin_users AS voider ON voider.id = md.voided_by")
+
+	union := db.Raw("? UNION ALL ? UNION ALL ?", platformManaged, withdrawal, manualOffline)
 	return db.Table("(?) AS d", union)
 }
 
@@ -179,6 +226,12 @@ type disbursementItemRow struct {
 	OperatorID        *uint64
 	OperatorName      string
 	Remark            string
+	Category          string
+	VoucherURL        string
+	VoidedAt          *time.Time
+	VoidedBy          *uint64
+	VoidedByName      string
+	VoidReason        string
 	SourcePayload     []byte
 }
 
@@ -217,5 +270,11 @@ func (r disbursementItemRow) toDTO() DisbursementItemDTO {
 		OperatorID:        r.OperatorID,
 		OperatorName:      r.OperatorName,
 		Remark:            r.Remark,
+		Category:          r.Category,
+		VoucherURL:        r.VoucherURL,
+		VoidedAt:          r.VoidedAt,
+		VoidedBy:          r.VoidedBy,
+		VoidedByName:      r.VoidedByName,
+		VoidReason:        r.VoidReason,
 	}
 }