fix(tenant): 收紧双站后台边界并补齐货架管理
This commit is contained in:
@@ -129,7 +129,8 @@ func (r *Repository) disbursementSummary(ctx context.Context, query DashboardQue
|
||||
}
|
||||
withdrawalQuery := db.Table("withdrawal_requests")
|
||||
if tenantID > 0 {
|
||||
withdrawalQuery = withdrawalQuery.Where("tenant_id = ?", tenantID)
|
||||
withdrawalQuery = withdrawalQuery.Where("tenant_id = ?", tenantID).
|
||||
Where("distribution_site_id = 0")
|
||||
}
|
||||
if err := withdrawalQuery.Select(`
|
||||
COALESCE(SUM(CASE WHEN status = 'completed' AND paid_at >= ? AND paid_at <= ? THEN amount_cent ELSE 0 END), 0) AS paid_amount_cent,
|
||||
@@ -232,7 +233,8 @@ func (r *Repository) dailyDisbursements(ctx context.Context, query DashboardQuer
|
||||
withdrawalRows := make([]dailyDisbursementSourceRow, 0)
|
||||
withdrawalQuery := db.Table("withdrawal_requests")
|
||||
if tenantID > 0 {
|
||||
withdrawalQuery = withdrawalQuery.Where("tenant_id = ?", tenantID)
|
||||
withdrawalQuery = withdrawalQuery.Where("tenant_id = ?", tenantID).
|
||||
Where("distribution_site_id = 0")
|
||||
}
|
||||
if err := withdrawalQuery.
|
||||
Select(`DATE_FORMAT(paid_at, '%Y-%m-%d') AS date,
|
||||
@@ -298,7 +300,9 @@ func applyRentalOrderTenantScope(db *gorm.DB, tenantID uint64) *gorm.DB {
|
||||
if tenantID == 0 {
|
||||
return db
|
||||
}
|
||||
return db.Where("(buyer_tenant_id = ? OR source_tenant_id = ?)", tenantID, tenantID)
|
||||
return db.
|
||||
Where("(buyer_tenant_id = ? OR source_tenant_id = ?)", tenantID, tenantID).
|
||||
Where("(distribution_site_id IS NULL OR distribution_site_id = 0)")
|
||||
}
|
||||
|
||||
type dailyDisbursementSourceRow struct {
|
||||
|
||||
Reference in New Issue
Block a user