缓存

Myshipping.Application/Entity/BookingStatusLog.cs

@@ -0,0 +1,39 @@
+using System;
+using SqlSugar;
+using System.ComponentModel;
+using Myshipping.Core.Entity;
+namespace Myshipping.Application.Entity
+{
+    /// <summary>
+    /// 货运跟踪
+    /// </summary>
+    [SugarTable("booking_status_log")]
+    [Description("货运跟踪")]
+    public class BookingStatusLog : DBEntityTenant
+    {
+        /// <summary>
+        /// 业务id
+        /// </summary>
+        public long? BookingId { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string Status { get; set; }
+        /// <summary>
+        /// 状态时间
+        /// </summary>
+        public DateTime? OpTiem { get; set; }
+        /// <summary>
+        /// 类别
+        /// </summary>
+        public string Gategory { get; set; }
+        /// <summary>
+        /// 状态分类
+        /// </summary>
+        public string Type { get; set; }
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string MBLNO { get; set; }
+    }
+}

Myshipping.Application/Entity/BookingStatusLogDetail.cs

@@ -0,0 +1,35 @@
+using System;
+using SqlSugar;
+using System.ComponentModel;
+using Myshipping.Core.Entity;
+namespace Myshipping.Application.Entity
+{
+    /// <summary>
+    /// 货运状态详情
+    /// </summary>
+    [SugarTable("booking_status_log_detail")]
+    [Description("货运状态详情")]
+    public class BookingStatusLogDetail : PrimaryKeyEntity
+    {
+        /// <summary>
+        /// 主单id
+        /// </summary>
+        public long? PId { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string Status { get; set; }
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string CNTRNO { get; set; }
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string MBLNO { get; set; }
+        /// <summary>
+        /// 状态时间
+        /// </summary>
+        public DateTime? OPTime { get; set; }
+    }
+}

Myshipping.Application/Entity/BookingTrace.cs

@@ -0,0 +1,23 @@
+using System;
+using SqlSugar;
+using System.ComponentModel;
+using Myshipping.Core.Entity;
+namespace Myshipping.Application.Entity
+{
+    /// <summary>
+    /// 订舱运踪映射表
+    /// </summary>
+    [SugarTable("booking_trace")]
+    [Description("订舱运踪映射表")]
+    public class BookingTrace : PrimaryKeyEntity
+    {
+        /// <summary>
+        /// 订舱id
+        /// </summary>
+        public long? BookingId { get; set; }
+        /// <summary>
+        /// 运踪id
+        /// </summary>
+        public string TraeId { get; set; }
+    }
+}

Myshipping.Application/Myshipping.Application.xml

@@ -1139,6 +1139,71 @@
             订舱备注
             </summary>
         </member>
+        <member name="T:Myshipping.Application.Entity.BookingStatusLog">
+            <summary>
+            货运跟踪
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLog.BookingId">
+            <summary>
+            业务id
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLog.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLog.OpTiem">
+            <summary>
+            状态时间
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLog.Gategory">
+            <summary>
+            类别
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLog.Type">
+            <summary>
+            状态分类
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLog.MBLNO">
+            <summary>
+            提单号
+            </summary>
+        </member>
+        <member name="T:Myshipping.Application.Entity.BookingStatusLogDetail">
+            <summary>
+            货运状态详情
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLogDetail.PId">
+            <summary>
+            主单id
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLogDetail.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLogDetail.CNTRNO">
+            <summary>
+            箱号
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLogDetail.MBLNO">
+            <summary>
+            提单号
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingStatusLogDetail.OPTime">
+            <summary>
+            状态时间
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.Entity.BookingTemplate">
             <summary>
             
@@ -1164,6 +1229,21 @@
             备注
             </summary>
         </member>
+        <member name="T:Myshipping.Application.Entity.BookingTrace">
+            <summary>
+            订舱运踪映射表
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingTrace.BookingId">
+            <summary>
+            订舱id
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingTrace.TraeId">
+            <summary>
+            运踪id
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.BookingCtnDetailDto">
             <summary>
             多品名输出参数
@@ -1965,6 +2045,15 @@
             <param name="Id"></param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Application.BookingOrderService.SendTrace(System.String,System.String,System.String)">
+            <summary>
+            调用运踪接口
+            </summary>
+            <param name="YARDID"></param>
+            <param name="YARD"></param>
+            <param name="MBLNO"></param>
+            <returns></returns>
+        </member>
         <member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingLogDto.Type">
             <summary>
             操作类型（新增，编辑）

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -511,8 +511,13 @@ namespace Myshipping.Application
             return list;
         }
 
-
-
+        /// <summary>
+        /// 调用运踪接口
+        /// </summary>
+        /// <param name="YARDID"></param>
+        /// <param name="YARD"></param>
+        /// <param name="MBLNO"></param>
+        /// <returns></returns>
         public async Task SendTrace(string YARDID, string YARD, string MBLNO)
         {
             _logger.LogInformation("提单号：" + MBLNO + " 调用运踪接口");
@@ -532,6 +537,7 @@ namespace Myshipping.Application
             billdto.Children = billTraceList;
             billdto.Key = key.Account;
             billdto.PWD = key.Password;
+            
             var json = billdto.ToJsonString();
             var html = await url.FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "seae_billtraceurl").Value.SetHttpMethod(HttpMethod.Post).SetQueries(new { msg = json }).SetRetryPolicy(3, 5000).SendAsAsync<RespCommon>();
             _logger.LogInformation("提单号：" + MBLNO + " 调用运踪接口返回" + html.ToJsonString());

Myshipping.Application/Service/BookingOrder/Dto/BillTraceDto.cs

@@ -13,7 +13,8 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         public string Key { get; set; }
 
         public string PWD { get; set; }
-
+        public string Gid { get; set; }
+        public string url { get; set; }
         public List<BillTraceList> Children { get; set; }
 
 
@@ -21,6 +22,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
 
     public class BillTraceList
     {
+        public string BusinessId { get; set; }
         public string MBLNO { get; set; }
 
         public string YARD { get; set; }
@@ -37,6 +39,8 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
     {
         public bool Success { get; set; }
         public string Message { get; set; }
+
+        public object Data { get; set; }
         public int Code { get; set; }
     }
 }

Myshipping.Core/Service/Cache/SysCacheService.cs

@@ -1,5 +1,6 @@
 using Furion.DependencyInjection;
 using Furion.DynamicApiController;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Myshipping.Core.Entity;
@@ -14,7 +15,8 @@ namespace Myshipping.Core.Service;
 /// <summary>
 /// 系统缓存服务
 /// </summary>
-[ApiDescriptionSettings(Name = "Cache", Order = 100)]
+[ApiDescriptionSettings(Name = "Cache", Order = 100),AllowAnonymous]
+
 public class SysCacheService : ISysCacheService, IDynamicApiController, ISingleton
 {
     private readonly ICache _cache;
@@ -585,6 +587,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// 设置字典参数
     /// </summary>
     /// <returns></returns>
+
     public Task SetAllDictData(List<DictDataDto> list)
     {
         return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_DICT_DATA, list);