From e5f5e7211ede109bcf288023ba82edbbb8741915 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Mon, 14 Nov 2022 15:59:45 +0800
Subject: [PATCH] link

---
 .../Myshipping.Application.xml                | 11 +++++++++
 .../BookingOrder/BookingOrderService.cs       | 23 ++++++++++++++-----
 .../BookingOrder/Dto/BookingOrderOutput.cs    | 23 ++++++++++++++++---
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index df9bb1bf..00b2b228 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -5201,6 +5201,17 @@
             订舱主表输出参数
             </summary>
         </member>
+        <member name="P:Myshipping.Application.BookingOrderUrlOutput.LinkUrlTxxp">
+            <summary>
+             提箱小票链接
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.BookingOrderUrlOutput.LinkUrlVgm">
+            <summary>
+            vgm链接
+            </summary>
+        </member>
+        <!-- Badly formed XML comment ignored for member "P:Myshipping.Application.BookingOrderUrlOutput.LinkUrlVmgSi" -->
         <member name="T:Myshipping.Application.BookingPrintTemplateService">
             <summary>
             订舱打印模板服务
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index eeefe3c3..7e2bbab5 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -159,7 +159,7 @@ namespace Myshipping.Application
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.HUMIDITY), u => u.HUMIDITY == input.HUMIDITY)
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.TEMPMIN), u => u.TEMPMIN == input.TEMPMIN)
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.TEMPMAX), u => u.TEMPMAX == input.TEMPMAX)
-                                     .WhereIF(input.ISCONTAINERSOC!=null, u => u.ISCONTAINERSOC == input.ISCONTAINERSOC)
+                                     .WhereIF(input.ISCONTAINERSOC != null, u => u.ISCONTAINERSOC == input.ISCONTAINERSOC)
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.SOREMARK), u => u.SOREMARK.Contains(input.SOREMARK))
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.SIREMARK), u => u.SIREMARK.Contains(input.SIREMARK))
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.YARDREMARK), u => u.YARDREMARK.Contains(input.YARDREMARK))
@@ -196,7 +196,7 @@ namespace Myshipping.Application
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICEID), u => u.CUSTSERVICEID == input.CUSTSERVICEID)
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICE), u => u.CUSTSERVICE.Contains(input.CUSTSERVICE))
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTOMERNAME), u => u.CUSTOMERNAME.Contains(input.CUSTOMERNAME))
-                                     .WhereIF(input.CUSTOMERID !=null, u => u.CUSTOMERID == input.CUSTOMERID)
+                                     .WhereIF(input.CUSTOMERID != null, u => u.CUSTOMERID == input.CUSTOMERID)
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.FORWARDER), u => u.FORWARDER.Contains(input.FORWARDER))
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICE), u => u.CUSTSERVICE == input.CUSTSERVICE)
                                      .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTOMERNAME), u => u.CUSTOMERNAME == input.CUSTOMERNAME)
@@ -401,11 +401,11 @@ namespace Myshipping.Application
         [HttpGet("/BookingOrder/get")]
         public async Task<BookingOrderOutput> Get(long Id)
         {
-            BookingOrderOutput list = new BookingOrderOutput();
+            BookingOrderOutput ordOut = new BookingOrderOutput();
             var main = await _rep.FirstOrDefaultAsync(u => u.Id == Id);
             if (main != null)
             {
-                list = main.Adapt<BookingOrderOutput>();
+                ordOut = main.Adapt<BookingOrderOutput>();
                 var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == Id).ToListAsync();
                 var ctninput = ctnlist.Adapt<List<BookingCtnDto>>();
                 foreach (var item in ctninput)
@@ -413,9 +413,20 @@ namespace Myshipping.Application
                     var ctndetaillist = await _ctndetailrep.AsQueryable().Where(x => x.CTNID == item.Id).ToListAsync();
                     item.ctnDetailInputs = ctndetaillist.Adapt<List<BookingCtnDetailDto>>();
                 }
-                list.ctnInputs = ctninput;
+                ordOut.ctnInputs = ctninput;
+
+                var ordUrl = _repOrderUrl.FirstOrDefault(x => x.BookingId == Id);
+                if (ordUrl != null)
+                {
+                    ordOut.Link = new BookingOrderUrlOutput()
+                    {
+                        LinkUrlTxxp = ordUrl.UrlTxxp,
+                        LinkUrlVgm = ordUrl.UrlVgm,
+                        LinkUrlVmgSi = ordUrl.UrlVgmSi,
+                    };
+                }
             }
-            return list;
+            return ordOut;
         }
         #endregion
 
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderOutput.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderOutput.cs
index c374dd3c..8a416d36 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderOutput.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderOutput.cs
@@ -5,9 +5,26 @@ namespace Myshipping.Application
     /// <summary>
     /// 订舱主表输出参数
     /// </summary>
-    public class BookingOrderOutput:BookingOrderDto
+    public class BookingOrderOutput : BookingOrderDto
     {
-     
-        
+        public BookingOrderUrlOutput Link { get; set; }
+    }
+
+    public class BookingOrderUrlOutput
+    {
+        /// <summary>
+        ///  提箱小票链接
+        /// </summary>
+        public string LinkUrlTxxp { get; set; }
+
+        /// <summary>
+        /// vgm链接
+        /// </summary>
+        public string LinkUrlVgm { get; set; }
+
+        /// <summary>
+        /// vgm&si链接
+        /// </summary>
+        public string LinkUrlVmgSi { get; set; }
     }
 }