fix(tenant): 收紧双站后台边界并补齐货架管理

This commit is contained in:
yml
2026-11-15 22:28:40 +08:00
parent a68eb815a9
commit 0cb385d84f
42 changed files with 831 additions and 97 deletions
@@ -411,7 +411,9 @@ func (r *Repository) dailyEstimates(ctx context.Context, query DashboardQuery) (
Where("status NOT IN ?", nonBillableOrderStatuses()).
Where("created_at >= ? AND created_at <= ?", query.StartDate, query.EndDate)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
orderQuery = orderQuery.Where("(buyer_tenant_id = ? OR source_tenant_id = ?)", tenantID, tenantID)
orderQuery = orderQuery.
Where("(buyer_tenant_id = ? OR source_tenant_id = ?)", tenantID, tenantID).
Where("(distribution_site_id IS NULL OR distribution_site_id = 0)")
}
err := orderQuery.
Group("DATE_FORMAT(created_at, '%Y-%m-%d')").
@@ -480,7 +482,9 @@ func (r *Repository) dailySettlements(ctx context.Context, query DashboardQuery)
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)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
settlementQuery = settlementQuery.Where("(ro.buyer_tenant_id = ? OR ro.source_tenant_id = ?)", tenantID, tenantID)
settlementQuery = settlementQuery.
Where("(ro.buyer_tenant_id = ? OR ro.source_tenant_id = ?)", tenantID, tenantID).
Where("(ro.distribution_site_id IS NULL OR ro.distribution_site_id = 0)")
}
err := settlementQuery.
Group("DATE_FORMAT(ro.settled_at, '%Y-%m-%d')").
@@ -566,7 +570,15 @@ func (r *Repository) dailyPayments(ctx context.Context, query DashboardQuery) ([
db := r.db.WithContext(ctx)
paymentQuery := db.Table("payment_orders AS po USE INDEX (idx_payment_orders_dashboard_created)")
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
paymentQuery = paymentQuery.Where("po.tenant_id = ?", tenantID)
paymentQuery = paymentQuery.
Where("po.tenant_id = ?", tenantID).
Where(`NOT EXISTS (
SELECT 1 FROM rental_orders AS legacy_order
WHERE legacy_order.id = po.order_id
AND legacy_order.distribution_site_id IS NOT NULL
AND legacy_order.distribution_site_id > 0
AND po.biz_type IN ?
)`, append([]string{"order_pay"}, refundBizTypes()...))
}
err := paymentQuery.
Select(`DATE_FORMAT(po.created_at, '%Y-%m-%d') AS date,
@@ -612,7 +624,13 @@ func (r *Repository) dailyPaidOrders(ctx context.Context, query DashboardQuery)
pickupTenantFilter := ""
args := []any{query.StartDate, query.EndDate}
if tenantID > 0 {
paymentTenantFilter = " AND tenant_id = ?"
paymentTenantFilter = ` AND tenant_id = ?
AND (biz_type <> 'order_pay' OR NOT EXISTS (
SELECT 1 FROM rental_orders AS legacy_order
WHERE legacy_order.id = payment_orders.order_id
AND legacy_order.distribution_site_id IS NOT NULL
AND legacy_order.distribution_site_id > 0
))`
pickupTenantFilter = " AND 1 = 0"
args = append(args, tenantID)
}