xf 4 months ago
parent
commit
7ac8c494b9
1 changed files with 12 additions and 5 deletions
  1. 12 5
      src/Hotline.Api/Controllers/OrderController.cs

+ 12 - 5
src/Hotline.Api/Controllers/OrderController.cs

@@ -290,11 +290,15 @@ public class OrderController : BaseController
     /// <param name="dto"></param>
     /// <param name="dto"></param>
     /// <returns></returns>
     /// <returns></returns>
     [HttpGet("publish/items")]
     [HttpGet("publish/items")]
-    public async Task<IList<PublishDto>> GetPublishOrderListAsync([FromQuery] QueryOrderPublishDto dto)
+    public async Task<IReadOnlyList<PublishDto>> GetPublishOrderListAsync([FromQuery] QueryOrderPublishDto dto)
     {
     {
-        var query = _orderApplication.GetPublishOrderList(dto);
-        return (await query.ToFixedListAsync(dto.QueryIndex, 200, HttpContext.RequestAborted))
-            .Adapt<List<PublishDto>>();
+        var orders = await _orderApplication.GetPublishOrderList(dto)
+            .ToPageListWithoutTotalAsync(dto, HttpContext.RequestAborted);
+
+        return _mapper.Map<IReadOnlyList<PublishDto>>(orders);
+
+        //return (await query.ToFixedListAsync(dto.QueryIndex, 200, HttpContext.RequestAborted))
+        //    .Adapt<List<PublishDto>>();
     }
     }
 
 
     /// <summary>
     /// <summary>
@@ -997,8 +1001,11 @@ public class OrderController : BaseController
     public async Task<PagedDto<OrderVisitDto>> QueryOrderVisitList([FromQuery] QueryOrderVisitDto dto)
     public async Task<PagedDto<OrderVisitDto>> QueryOrderVisitList([FromQuery] QueryOrderVisitDto dto)
     {
     {
         var (total, items) = await _orderApplication.QueryOrderVisitList(dto).ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         var (total, items) = await _orderApplication.QueryOrderVisitList(dto).ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
-
         return new PagedDto<OrderVisitDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDto>>(items));
         return new PagedDto<OrderVisitDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDto>>(items));
+
+        //var orderVisits = await _orderApplication.QueryOrderVisitList(dto)
+        //    .ToPageListWithoutTotalAsync(dto, HttpContext.RequestAborted);
+        //return _mapper.Map<>()
     }
     }
 
 
     /// <summary>
     /// <summary>