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
+20 -2
View File
@@ -54,8 +54,26 @@ func (r *Repository) AdminList(ctx context.Context, query AdminPaymentQuery) (*P
Joins("LEFT JOIN users AS u ON u.id = p.user_id")
countDB := r.db.WithContext(ctx).Model(&model.PaymentOrder{})
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
db = db.Where("p.tenant_id = ?", tenantID)
countDB = countDB.Where("tenant_id = ?", tenantID)
legacyDistributionCondition := `NOT EXISTS (
SELECT 1 FROM rental_orders AS legacy_order
WHERE legacy_order.id = p.order_id
AND legacy_order.distribution_site_id IS NOT NULL
AND legacy_order.distribution_site_id > 0
AND p.biz_type IN ?
)`
orderBizTypes := append([]string{"order_pay"}, RefundBizTypes()...)
db = db.Where("p.tenant_id = ?", tenantID).
Where(legacyDistributionCondition, orderBizTypes)
countDB = countDB.Where("tenant_id = ?", tenantID).Where(
`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
AND payment_orders.biz_type IN ?
)`,
orderBizTypes,
)
}
if query.UserID > 0 {
db = db.Where("p.user_id = ?", query.UserID)