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

feat: 接入旧站管理端并完整迁移后台能力

Browse Source
This commit is contained in:
yml
2026-11-12 22:03:01 +08:00
parent e5f923706b
commit a4441bba9a
509 changed files with 140714 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/adminfinance/dashboard.go
+9 -9
View File
@@ -109,7 +109,7 @@ func (r *Repository) pickupSummary(ctx context.Context, query DashboardQuery) (*
ProfitAmountCent int64
CompletedCount int64
}
if err := db.Table("admin_pickups").
if err := db.Table("admin_pickups USE INDEX (idx_admin_pickups_dashboard_completed)").
Select(`COALESCE(SUM(settle_amount_cent), 0) AS settled_amount_cent, COALESCE(SUM(profit_amount_cent), 0) AS profit_amount_cent, COUNT(id) AS completed_count`).
Where("status = ?", "completed").
Where("completed_at >= ? AND completed_at <= ?", query.StartDate, query.EndDate).
@@ -136,7 +136,7 @@ func (r *Repository) pickupSummary(ctx context.Context, query DashboardQuery) (*
AmountCent int64
Count int64
}
if err := db.Table("admin_pickups").
if err := db.Table("admin_pickups USE INDEX (idx_admin_pickups_dashboard_offline_settlement)").
Select(`COALESCE(SUM(settle_amount_cent), 0) AS amount_cent, COUNT(id) AS count`).
Where("settlement_mode = ? AND offline_settlement_status = ? AND settle_amount_cent > 0", "platform_managed", "pending").
Scan(&pending).Error; err != nil {
@@ -240,7 +240,7 @@ func (r *Repository) dailyItems(ctx context.Context, query DashboardQuery) (dash
}
pickupProfits := make([]dailyPickupProfitRow, 0)
if err := db.Table("admin_pickups").
if err := db.Table("admin_pickups USE INDEX (idx_admin_pickups_dashboard_completed)").
Select(`DATE_FORMAT(completed_at, '%Y-%m-%d') AS date,
COALESCE(SUM(profit_amount_cent), 0) AS profit_amount_cent,
COUNT(id) AS completed_count`).
@@ -388,7 +388,7 @@ func (r *Repository) dailyItems(ctx context.Context, query DashboardQuery) (dash
func (r *Repository) dailyEstimates(ctx context.Context, query DashboardQuery) ([]dailyEstimatedRow, error) {
rows := make([]dailyEstimatedRow, 0)
err := r.db.WithContext(ctx).Table("rental_orders").
err := r.db.WithContext(ctx).Table("rental_orders USE INDEX (idx_rental_orders_dashboard_estimates)").
Select(`DATE_FORMAT(created_at, '%Y-%m-%d') AS date,
COALESCE(SUM(platform_fee_cent), 0) AS estimated_income_amount_cent,
COUNT(id) AS pending_settle_order_count`).
@@ -403,7 +403,7 @@ func (r *Repository) dailyEstimates(ctx context.Context, query DashboardQuery) (
func (r *Repository) dailySettlements(ctx context.Context, query DashboardQuery) ([]dailySettlementRow, error) {
db := r.db.WithContext(ctx)
rows := make([]dailySettlementRow, 0)
err := db.Table("rental_orders AS ro").
err := db.Table("rental_orders AS ro USE INDEX (idx_rental_orders_dashboard_settled)").
Select(`DATE_FORMAT(ro.settled_at, '%Y-%m-%d') AS date,
COALESCE(SUM(oc.platform_fee_cent), 0) AS platform_income_amount_cent,
COALESCE(SUM(oc.owner_income_amount_cent), 0) AS owner_should_income_amount_cent,
@@ -445,7 +445,7 @@ func (r *Repository) dailySettlements(ctx context.Context, query DashboardQuery)
COUNT(ro.id) AS settled_order_count`, settlementDiffThresholdCent, refundBizTypes(), []string{"refunding", "failed"}).
// 统计口径：只算"正常结账确认"的订单。仲裁结案的结账单终态是 settled
// （由 dispute 模块写入），不纳入本指标，此处保持既有口径不变。
Joins("JOIN order_checkouts AS oc ON oc.order_id = ro.id AND oc.status = ?", ordermodule.CheckoutStatusAccepted).
Joins("JOIN order_checkouts AS oc USE INDEX (idx_order_checkouts_dashboard_accepted) ON oc.order_id = ro.id AND oc.status = ?", ordermodule.CheckoutStatusAccepted).
Joins("LEFT JOIN (?) AS w ON w.order_id = ro.id", ownerWalletIncomeForSettledOrdersSubquery(db, query)).
Where("ro.settled_at >= ? AND ro.settled_at <= ?", query.StartDate, query.EndDate).
Group("DATE_FORMAT(ro.settled_at, '%Y-%m-%d')").
@@ -523,7 +523,7 @@ func operatingExpenseSummaryFromDailyRows(rows []dailyOperatingExpenseRow) Opera
func (r *Repository) dailyPayments(ctx context.Context, query DashboardQuery) ([]dailyPaymentRow, error) {
rows := make([]dailyPaymentRow, 0)
db := r.db.WithContext(ctx)
err := db.Table("payment_orders AS po").
err := db.Table("payment_orders AS po USE INDEX (idx_payment_orders_dashboard_created)").
Select(`DATE_FORMAT(po.created_at, '%Y-%m-%d') AS date,
COALESCE(SUM(CASE WHEN po.biz_type IN ? AND po.status = 'paid' THEN po.amount_cent ELSE 0 END), 0) AS total_flow_amount_cent,
COALESCE(SUM(CASE WHEN po.biz_type IN ? AND po.status = 'refunded' THEN po.amount_cent ELSE 0 END), 0) AS total_refund_amount_cent,
@@ -561,12 +561,12 @@ func (r *Repository) dailyPaidOrders(ctx context.Context, query DashboardQuery)
items := make([]dailyPaidOrderRow, 0)
err := r.db.WithContext(ctx).Table(`(
SELECT DATE_FORMAT(paid_at, '%Y-%m-%d') AS date, COUNT(DISTINCT order_id) AS paid_order_count
FROM payment_orders
FROM payment_orders USE INDEX (idx_payment_orders_biz_status_paid_at_order)
WHERE biz_type = 'order_pay' AND status = 'paid' AND paid_at >= ? AND paid_at <= ?
GROUP BY DATE_FORMAT(paid_at, '%Y-%m-%d')
UNION ALL
SELECT DATE_FORMAT(completed_at, '%Y-%m-%d') AS date, COUNT(id) AS paid_order_count
FROM admin_pickups
FROM admin_pickups USE INDEX (idx_admin_pickups_dashboard_completed)
WHERE status = 'completed' AND completed_at >= ? AND completed_at <= ?
GROUP BY DATE_FORMAT(completed_at, '%Y-%m-%d')
) AS daily_paid_orders`, query.StartDate, query.EndDate, query.StartDate, query.EndDate).
backend/internal/modules/adminfinance/disbursement.go
+6 -6
View File
@@ -27,7 +27,7 @@ func (r *Repository) disbursementSummary(ctx context.Context, query DashboardQue
AmountCent int64
Count int64
}
if err := db.Table("rental_orders").
if err := db.Table("rental_orders USE INDEX (idx_rental_orders_dashboard_offline_settlement)").
Select(`COALESCE(SUM(offline_settlement_amount_cent), 0) AS amount_cent, COUNT(id) AS count`).
Where("settlement_mode = ?", "platform_managed").
Where("offline_settlement_status = ?", "settled").
@@ -39,7 +39,7 @@ func (r *Repository) disbursementSummary(ctx context.Context, query DashboardQue
AmountCent int64
Count int64
}
if err := db.Table("admin_pickups").
if err := db.Table("admin_pickups USE INDEX (idx_admin_pickups_dashboard_offline_settlement)").
Select(`COALESCE(SUM(settle_amount_cent), 0) AS amount_cent, COUNT(id) AS count`).
Where("settlement_mode = ?", "platform_managed").
Where("offline_settlement_status = ?", "settled").
@@ -65,7 +65,7 @@ func (r *Repository) disbursementSummary(ctx context.Context, query DashboardQue
AmountCent int64
Count int64
}
if err := db.Table("rental_orders").
if err := db.Table("rental_orders USE INDEX (idx_rental_orders_dashboard_offline_settlement)").
Select(`COALESCE(SUM(offline_settlement_amount_cent), 0) AS amount_cent, COUNT(id) AS count`).
Where("settlement_mode = ?", "platform_managed").
Where("offline_settlement_status = ?", "pending").
@@ -77,7 +77,7 @@ func (r *Repository) disbursementSummary(ctx context.Context, query DashboardQue
AmountCent int64
Count int64
}
if err := db.Table("admin_pickups").
if err := db.Table("admin_pickups USE INDEX (idx_admin_pickups_dashboard_offline_settlement)").
Select(`COALESCE(SUM(settle_amount_cent), 0) AS amount_cent, COUNT(id) AS count`).
Where("settlement_mode = ?", "platform_managed").
Where("offline_settlement_status = ?", "pending").
@@ -161,7 +161,7 @@ func (r *Repository) disbursementSummary(ctx context.Context, query DashboardQue
func (r *Repository) dailyDisbursements(ctx context.Context, query DashboardQuery) ([]dailyDisbursementRow, error) {
db := r.db.WithContext(ctx)
offlineRows := make([]dailyDisbursementSourceRow, 0)
if err := db.Table("rental_orders").
if err := db.Table("rental_orders USE INDEX (idx_rental_orders_dashboard_offline_settlement)").
Select(`DATE_FORMAT(offline_settled_at, '%Y-%m-%d') AS date,
COALESCE(SUM(offline_settlement_amount_cent), 0) AS amount_cent,
COUNT(id) AS count`).
@@ -173,7 +173,7 @@ func (r *Repository) dailyDisbursements(ctx context.Context, query DashboardQuer
return nil, err
}
pickupOfflineRows := make([]dailyDisbursementSourceRow, 0)
if err := db.Table("admin_pickups").
if err := db.Table("admin_pickups USE INDEX (idx_admin_pickups_dashboard_offline_settlement)").
Select(`DATE_FORMAT(offline_settled_at, '%Y-%m-%d') AS date,
COALESCE(SUM(settle_amount_cent), 0) AS amount_cent,
COUNT(id) AS count`).
backend/internal/modules/adminfinance/disbursement_list.go
+29 -6
View File
@@ -11,7 +11,7 @@ import (
func (r *Repository) Disbursements(ctx context.Context, query DisbursementQuery) (*DisbursementListDTO, error) {
var summary DisbursementListSummaryDTO
summaryDB := r.applyDisbursementFilters(r.disbursementListBaseQuery(ctx), query)
summaryDB := r.applyDisbursementFilters(r.disbursementListBaseQuery(ctx, query.Keyword), query)
if err := summaryDB.Select(`COUNT(*) AS record_count,
COALESCE(SUM(CASE WHEN status = 'paid' THEN actual_amount_cent ELSE 0 END), 0) AS paid_amount_cent,
COALESCE(SUM(CASE WHEN status = 'paid' THEN 1 ELSE 0 END), 0) AS paid_count,
@@ -30,7 +30,7 @@ func (r *Repository) Disbursements(ctx context.Context, query DisbursementQuery)
orderColumn = "paid_at"
}
offset := (query.Page - 1) * query.PageSize
rowsDB := r.applyDisbursementFilters(r.disbursementListBaseQuery(ctx), query)
rowsDB := r.applyDisbursementFilters(r.disbursementListBaseQuery(ctx, query.Keyword), query)
if err := rowsDB.Order(orderColumn + " DESC").
Order("source_id DESC").
Offset(offset).
@@ -52,7 +52,7 @@ func (r *Repository) Disbursements(ctx context.Context, query DisbursementQuery)
}, nil
}
func (r *Repository) disbursementListBaseQuery(ctx context.Context) *gorm.DB {
func (r *Repository) disbursementListBaseQuery(ctx context.Context, phoneKeyword string) *gorm.DB {
db := r.db.WithContext(ctx)
platformManaged := db.Table("rental_orders AS ro").
Select(`'platform_managed' AS source_type,
@@ -213,6 +213,11 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context) *gorm.DB {
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)")
if phoneKeyword = strings.TrimSpace(phoneKeyword); isPhoneKeyword(phoneKeyword) {
withdrawal = withdrawal.Where("wr.user_id = (SELECT id FROM users WHERE phone = ?)", phoneKeyword)
return db.Table("(?) AS d", withdrawal)
}
manualOffline := db.Table("manual_disbursements AS md").
Select(`'manual_offline' AS source_type,
md.id AS source_id,
@@ -267,9 +272,15 @@ func (r *Repository) applyDisbursementFilters(db *gorm.DB, query DisbursementQue
db = db.Where("d.user_id = ?", query.UserID)
}
if query.Keyword != "" {
like := "%" + query.Keyword + "%"
db = db.Where(`(d.business_no LIKE ? OR d.payee_name LIKE ? OR d.payee_phone LIKE ?
OR d.uploader_name LIKE ? OR d.account_name LIKE ? OR d.account_no LIKE ?)`, like, like, like, like, like, like)
keyword := strings.TrimSpace(query.Keyword)
if isPhoneKeyword(keyword) {
// 完整手机号只可能命中提现收款人，先经 users(phone) 唯一索引解析用户。
db = db.Where("d.source_type = ? AND d.user_id = (SELECT id FROM users WHERE phone = ?)", "withdrawal", keyword)
} else {
like := "%" + keyword + "%"
db = db.Where(`(d.business_no LIKE ? OR d.payee_name LIKE ? OR d.payee_phone LIKE ?
OR d.uploader_name LIKE ? OR d.account_name LIKE ? OR d.account_no LIKE ?)`, like, like, like, like, like, like)
}
}
if query.Operator != "" {
like := "%" + query.Operator + "%"
@@ -288,6 +299,18 @@ func (r *Repository) applyDisbursementFilters(db *gorm.DB, query DisbursementQue
return db
}
func isPhoneKeyword(s string) bool {
if len(s) != 11 || s[0] != '1' {
return false
}
for i := 0; i < len(s); i++ {
if s[i] < '0' || s[i] > '9' {
return false
}
}
return true
}
type disbursementItemRow struct {
SourceType string
SourceID uint64
backend/internal/modules/adminfinance/disbursement_list_test.go
+16
View File
@@ -95,6 +95,22 @@ func TestDisbursementListCombinesPlatformSettlementsAndWithdrawals(t *testing.T)
if result.Summary.ReviewPendingAmountCent != 5000 || result.Summary.ReviewPendingCount != 1 {
t.Fatalf("待审核 = %d/%d, want 5000/1", result.Summary.ReviewPendingAmountCent, result.Summary.ReviewPendingCount)
}
phoneFiltered, err := repo.Disbursements(t.Context(), DisbursementQuery{
Keyword: "13900000000",
Page: 1,
PageSize: 20,
})
if err != nil {
t.Fatalf("按完整手机号查询出款失败: %v", err)
}
if phoneFiltered.Total != 3 {
t.Fatalf("按完整手机号查询记录数 = %d, want 3", phoneFiltered.Total)
}
for _, item := range phoneFiltered.Items {
if item.SourceType != "withdrawal" || item.PayeePhone != "13900000000" {
t.Fatalf("完整手机号筛选返回了不匹配记录: %+v", item)
}
}
var platformItem *DisbursementItemDTO
for index := range result.Items {
backend/internal/modules/adminfinance/subquery.go
+2 -2
View File
@@ -50,11 +50,11 @@ func ownerWalletIncomeForSettledOrdersSubquery(db *gorm.DB, query DashboardQuery
// paymentOriginalAmountForRefundsInRangeSubquery 仅为当前区间内的退款单回查原支付金额。
// 退款统计原先会对全部历史支付单按 order_id 聚合；数据增长后这部分即使只看一天也会很慢。
func paymentOriginalAmountForRefundsInRangeSubquery(db *gorm.DB, query DashboardQuery) *gorm.DB {
refundOrders := db.Table("payment_orders AS refund").
refundOrders := db.Table("payment_orders AS refund USE INDEX (idx_payment_orders_dashboard_created)").
Select("DISTINCT refund.order_id").
Where("refund.biz_type IN ? AND refund.status = ?", refundBizTypes(), "refunded").
Where("refund.created_at >= ? AND refund.created_at <= ?", query.StartDate, query.EndDate)
return db.Table("payment_orders AS paid").
return db.Table("payment_orders AS paid USE INDEX (idx_payment_orders_dashboard_order)").
Select("paid.order_id, MAX(paid.amount_cent) AS amount_cent").
Joins("JOIN (?) AS refund_order ON refund_order.order_id = paid.order_id", refundOrders).
Where("paid.biz_type IN ? AND paid.status = ?", payBizTypes(), "paid").