refactor: 收紧角色与商户跨租户能力

src/Domain/TakeoutSaaS.Domain/Merchants/Repositories/IMerchantRepository.cs

@@ -18,22 +18,6 @@ public interface IMerchantRepository
     /// <returns>商户实体或 null。</returns>
     Task<Merchant?> FindByIdAsync(long merchantId, long tenantId, CancellationToken cancellationToken = default);
 
-    /// <summary>
-    /// 依据标识获取商户（忽略租户过滤）。
-    /// </summary>
-    /// <param name="merchantId">商户 ID。</param>
-    /// <param name="cancellationToken">取消标记。</param>
-    /// <returns>商户实体或 null。</returns>
-    Task<Merchant?> FindByIdAsync(long merchantId, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// 依据租户标识获取商户（忽略租户过滤）。
-    /// </summary>
-    /// <param name="tenantId">租户 ID。</param>
-    /// <param name="cancellationToken">取消标记。</param>
-    /// <returns>商户实体或 null。</returns>
-    Task<Merchant?> FindByTenantIdAsync(long tenantId, CancellationToken cancellationToken = default);
-
     /// <summary>
     /// 按状态筛选商户列表。
     /// </summary>
@@ -44,16 +28,16 @@ public interface IMerchantRepository
     Task<IReadOnlyList<Merchant>> SearchAsync(long tenantId, MerchantStatus? status, CancellationToken cancellationToken = default);
 
     /// <summary>
-    /// 按条件筛选商户列表（支持跨租户）。
+    /// 按条件筛选商户列表。
     /// </summary>
-    /// <param name="tenantId">租户 ID，为 null 时查询全部租户。</param>
+    /// <param name="tenantId">租户 ID。</param>
     /// <param name="status">状态过滤。</param>
     /// <param name="operatingMode">经营模式过滤。</param>
     /// <param name="keyword">关键词过滤。</param>
     /// <param name="cancellationToken">取消标记。</param>
     /// <returns>商户集合。</returns>
     Task<IReadOnlyList<Merchant>> SearchAsync(
-        long? tenantId,
+        long tenantId,
         MerchantStatus? status,
         OperatingMode? operatingMode,
         string? keyword,