From 907abb8363044f2d72a1b65df37ea5b9b8f3bbda Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Thu, 17 Nov 2022 10:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingOrderService.cs       | 20 +++++++++++--------
 .../BookingOrder/IBookingOrderService.cs      |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index b05341f7..ed169a5a 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -457,16 +457,18 @@ namespace Myshipping.Application
         /// <param name="Id"></param>
         /// <returns></returns>
         [HttpGet("/BookingOrder/getLog")]
-        public async Task<BookingLogDto> GetLog(long Id)
+        public async Task<List<BookingLogDto>> GetLog(long Id)
         {
-            BookingLogDto list = new BookingLogDto();
-            var main = await _bookinglog.FirstOrDefaultAsync(u => u.BookingId == Id);
-            if (main != null)
+            List<BookingLogDto> list = new List<BookingLogDto>();
+            var main = await _bookinglog.AsQueryable().Where(u => u.BookingId == Id).ToListAsync();
+            list = main.Adapt<List<BookingLogDto>>();
+            if (list != null)
             {
-                list = main.Adapt<BookingLogDto>();
-                var details = await _bookinglogdetail.AsQueryable().Where(x => x.PId == main.Id).ToListAsync();
-
-                list.details = details;
+                foreach (var item in list)
+                {
+                    var details = await _bookinglogdetail.AsQueryable().Where(x => x.PId == item.Id).ToListAsync();
+                    item.details = details;
+                }
             }
             return list;
         }
@@ -592,6 +594,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 调用运踪接口
         /// </summary>
+        [NonAction]
         public async Task SendTrace(string BusinessId, string YARDID, string YARD, string MBLNO)
         {
             _logger.LogInformation("提单号：" + MBLNO + " 调用运踪接口");
@@ -624,6 +627,7 @@ namespace Myshipping.Application
         /// </summary>
         [AllowAnonymous]
         [SqlSugarUnitOfWork]
+        [NonAction]
         public async Task AddBookingStatusLog(List<BookingStatusLogDto> all)
         {
 
diff --git a/Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs
index cf963c3e..8db10aca 100644
--- a/Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs
@@ -16,7 +16,7 @@ namespace Myshipping.Application
         Task Update(UpdateBookingOrderInput input);
         Task<BookingOrderOutput> Get(long Id);
         Task<dynamic> Page([FromQuery] BookingOrderInput input);
-        Task<BookingLogDto> GetLog(long Id);
+        Task<List<BookingLogDto>> GetLog(long Id);
 
 
         Task<List<BookingRemark>> GetRemark(long Id);