田爽 пре 1 година
родитељ
комит
c0da6eac5f

+ 1 - 0
src/Hotline.Api/Controllers/BaseController.cs

@@ -7,6 +7,7 @@ namespace Hotline.Api.Controllers;
 [ApiController]
 [Produces("application/json")]
 [Route("api/v1/[controller]")]
+[LogFilter]
 public class BaseController : ControllerBase
 {
     

+ 2 - 2
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -1595,7 +1595,7 @@ namespace Hotline.Api.Controllers.Bi
 		/// <param name="dto"></param>
 		/// <returns></returns>
 		[HttpGet("reTransact_detail")]
-		public async Task<PagedDto<OrderSpecialDto>> OrderReTransactDetail([FromQuery] QueryOrderReTransactDetailRequest dto) 
+		public async Task<PagedDto<OrderSpecialDetailDto>> OrderReTransactDetail([FromQuery] QueryOrderReTransactDetailRequest dto) 
         {
 			if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
 				throw UserFriendlyException.SameMessage("请选择时间!");
@@ -1609,7 +1609,7 @@ namespace Hotline.Api.Controllers.Bi
 				.Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
 				.Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
 				.ToPagedListAsync(dto, HttpContext.RequestAborted);
-			return new PagedDto<OrderSpecialDto>(total, _mapper.Map<IReadOnlyList<OrderSpecialDto>>(items));
+			return new PagedDto<OrderSpecialDetailDto>(total, _mapper.Map<IReadOnlyList<OrderSpecialDetailDto>>(items));
 		}
 
         /// <summary>

+ 2 - 0
src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

@@ -427,5 +427,7 @@ namespace Hotline.Share.Dtos.Order
 		public string ErrorId { get; set; }
 
 		public string ErrorName { get; set; }
+
+		public OrderSpecialDto OrderSpecial { get; set; }
 	}
 }