完成门店管理后端接口与任务

src/Application/TakeoutSaaS.Application/App/Stores/Handlers/SearchStoresQueryHandler.cs

@@ -1,4 +1,5 @@
 using MediatR;
+using TakeoutSaaS.Application.App.Stores;
 using TakeoutSaaS.Application.App.Stores.Dto;
 using TakeoutSaaS.Application.App.Stores.Queries;
 using TakeoutSaaS.Domain.Stores.Repositories;
@@ -15,19 +16,19 @@ public sealed class SearchStoresQueryHandler(
     ITenantProvider tenantProvider)
     : IRequestHandler<SearchStoresQuery, PagedResult<StoreDto>>
 {
-    private readonly IStoreRepository _storeRepository = storeRepository;
-    private readonly ITenantProvider _tenantProvider = tenantProvider;
-
     /// <inheritdoc />
     public async Task<PagedResult<StoreDto>> Handle(SearchStoresQuery request, CancellationToken cancellationToken)
     {
-        var tenantId = _tenantProvider.GetCurrentTenantId();
-        var stores = await _storeRepository.SearchAsync(tenantId, request.Status, cancellationToken);
-
-        if (request.MerchantId.HasValue)
-        {
-            stores = stores.Where(x => x.MerchantId == request.MerchantId.Value).ToList();
-        }
+        var tenantId = tenantProvider.GetCurrentTenantId();
+        var stores = await storeRepository.SearchAsync(
+            tenantId,
+            request.MerchantId,
+            request.Status,
+            request.AuditStatus,
+            request.BusinessStatus,
+            request.OwnershipType,
+            request.Keyword,
+            cancellationToken);
 
         var sorted = ApplySorting(stores, request.SortBy, request.SortDescending);
         var paged = sorted
@@ -35,7 +36,7 @@ public sealed class SearchStoresQueryHandler(
             .Take(request.PageSize)
             .ToList();
 
-        var items = paged.Select(MapToDto).ToList();
+        var items = paged.Select(StoreMapping.ToDto).ToList();
         return new PagedResult<StoreDto>(items, request.Page, request.PageSize, stores.Count);
     }
 
@@ -53,30 +54,4 @@ public sealed class SearchStoresQueryHandler(
         };
     }
 
-    private static StoreDto MapToDto(Domain.Stores.Entities.Store store) => new()
-    {
-        Id = store.Id,
-        TenantId = store.TenantId,
-        MerchantId = store.MerchantId,
-        Code = store.Code,
-        Name = store.Name,
-        Phone = store.Phone,
-        ManagerName = store.ManagerName,
-        Status = store.Status,
-        Province = store.Province,
-        City = store.City,
-        District = store.District,
-        Address = store.Address,
-        Longitude = store.Longitude,
-        Latitude = store.Latitude,
-        Announcement = store.Announcement,
-        Tags = store.Tags,
-        DeliveryRadiusKm = store.DeliveryRadiusKm,
-        SupportsDineIn = store.SupportsDineIn,
-        SupportsPickup = store.SupportsPickup,
-        SupportsDelivery = store.SupportsDelivery,
-        SupportsReservation = store.SupportsReservation,
-        SupportsQueueing = store.SupportsQueueing,
-        CreatedAt = store.CreatedAt
-    };
 }