From c2d52217196b8c6b2dc883eb1cdad153efa6f3e2 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 5 Jul 2024 11:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MSK=20API=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=88=B9=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingOrder/BookingCOSCOService.cs | 112 +++---- .../BookingOrder/BookingMSKAPIService.cs | 305 ++++++++++++++---- ...SKAPISearchPoint2PointScheduleResultDto.cs | 99 +++++- .../Dto/QueryShipSailingScheduleDto.cs | 20 ++ .../Dto/SearchShipSailingScheduleResultDto.cs | 111 ++----- Myshipping.Core/Myshipping.Core.xml | 20 ++ .../Dto/DjyWebsiteAccountConfigInput.cs | 22 +- 7 files changed, 486 insertions(+), 203 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingCOSCOService.cs b/Myshipping.Application/Service/BookingOrder/BookingCOSCOService.cs index d4b84f55..b53e2ea8 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingCOSCOService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingCOSCOService.cs @@ -148,62 +148,62 @@ namespace Myshipping.Application.Service.BookingOrder { resultInfo.data.ForEach(a => { - a.transportSchedules.ForEach(b => - { - SearchShipSailingScheduleResultDto info = new SearchShipSailingScheduleResultDto - { - carrierProductId = a.carrierProductId, - carrierProductSequenceId = a.carrierProductSequenceId, - ETD = b.departureDateTime, - ATD = b.arrivalDateTime, - vesselOperatorCarrierCode = b.vesselOperatorCarrierCode - }; - - if (b.departureDateTime.HasValue && b.arrivalDateTime.HasValue) - { - TimeSpan ts = b.arrivalDateTime.Value.Subtract(b.departureDateTime.Value); - var timeDiff = ts.TotalHours; - - info.days = (int)Math.Ceiling(timeDiff / 24.0); - } - - if (b.facilities != null) - { - info.orignCityName = b.facilities.collectionOrigin?.cityName; - info.orignCarrierSiteGeoID = b.facilities.collectionOrigin?.carrierSiteGeoID; - info.orignLocationName = b.facilities.collectionOrigin?.locationName; - info.orignCountryCode = b.facilities.collectionOrigin?.countryCode; - info.orignLocationType = b.facilities.collectionOrigin?.locationType; - info.orignUNLocationCode = b.facilities.collectionOrigin?.UNLocationCode; - info.orignUNRegionCode = b.facilities.collectionOrigin?.UNRegionCode; - - info.deliveryCityName = b.facilities.deliveryDestination?.cityName; - info.deliveryCarrierSiteGeoID = b.facilities.deliveryDestination?.carrierSiteGeoID; - info.deliveryLocationName = b.facilities.deliveryDestination?.locationName; - info.deliveryCountryCode = b.facilities.deliveryDestination?.countryCode; - info.deliveryLocationType = b.facilities.deliveryDestination?.locationType; - info.deliveryUNLocationCode = b.facilities.deliveryDestination?.UNLocationCode; - info.deliveryUNRegionCode = b.facilities.deliveryDestination?.UNRegionCode; - } - - info.vesselIMONumber = b.firstDepartureVessel?.vesselIMONumber; - info.carrierVesselCode = b.firstDepartureVessel?.carrierVesselCode; - info.vesselName = b.firstDepartureVessel?.vesselName; - - if (b.transportLegs != null && b.transportLegs.Count > 0) - { - var firstTransportLegs = b.transportLegs.FirstOrDefault(); - - if (firstTransportLegs.transport != null) - { - info.transportMode = firstTransportLegs.transport.transportMode; - info.carrierDepartureVoyageNumber = firstTransportLegs.transport.carrierDepartureVoyageNumber; - } - - } - - list.Add(info); - }); + //a.transportSchedules.ForEach(b => + //{ + // SearchShipSailingScheduleResultDto info = new SearchShipSailingScheduleResultDto + // { + // carrierProductId = a.carrierProductId, + // carrierProductSequenceId = a.carrierProductSequenceId, + // ETD = b.departureDateTime, + // ATD = b.arrivalDateTime, + // vesselOperatorCarrierCode = b.vesselOperatorCarrierCode + // }; + + // if (b.departureDateTime.HasValue && b.arrivalDateTime.HasValue) + // { + // TimeSpan ts = b.arrivalDateTime.Value.Subtract(b.departureDateTime.Value); + // var timeDiff = ts.TotalHours; + + // info.days = (int)Math.Ceiling(timeDiff / 24.0); + // } + + // if (b.facilities != null) + // { + // info.orignCityName = b.facilities.collectionOrigin?.cityName; + // info.orignCarrierSiteGeoID = b.facilities.collectionOrigin?.carrierSiteGeoID; + // info.orignLocationName = b.facilities.collectionOrigin?.locationName; + // info.orignCountryCode = b.facilities.collectionOrigin?.countryCode; + // info.orignLocationType = b.facilities.collectionOrigin?.locationType; + // info.orignUNLocationCode = b.facilities.collectionOrigin?.UNLocationCode; + // info.orignUNRegionCode = b.facilities.collectionOrigin?.UNRegionCode; + + // info.deliveryCityName = b.facilities.deliveryDestination?.cityName; + // info.deliveryCarrierSiteGeoID = b.facilities.deliveryDestination?.carrierSiteGeoID; + // info.deliveryLocationName = b.facilities.deliveryDestination?.locationName; + // info.deliveryCountryCode = b.facilities.deliveryDestination?.countryCode; + // info.deliveryLocationType = b.facilities.deliveryDestination?.locationType; + // info.deliveryUNLocationCode = b.facilities.deliveryDestination?.UNLocationCode; + // info.deliveryUNRegionCode = b.facilities.deliveryDestination?.UNRegionCode; + // } + + // info.vesselIMONumber = b.firstDepartureVessel?.vesselIMONumber; + // info.carrierVesselCode = b.firstDepartureVessel?.carrierVesselCode; + // info.vesselName = b.firstDepartureVessel?.vesselName; + + // if (b.transportLegs != null && b.transportLegs.Count > 0) + // { + // var firstTransportLegs = b.transportLegs.FirstOrDefault(); + + // if (firstTransportLegs.transport != null) + // { + // info.transportMode = firstTransportLegs.transport.transportMode; + // info.carrierDepartureVoyageNumber = firstTransportLegs.transport.carrierDepartureVoyageNumber; + // } + + // } + + // list.Add(info); + //}); }); } } diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index a157adff..3c8b7b0a 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -24,6 +24,10 @@ using Org.BouncyCastle.Crypto; using Yitter.IdGenerator; using MySqlX.XDevAPI.Common; using NPOI.OpenXmlFormats.Wordprocessing; +using Newtonsoft.Json; +using StackExchange.Profiling.Internal; +using SqlSugar; +using static Aliyun.OSS.Model.InventoryConfigurationModel; namespace Myshipping.Application.Service.BookingOrder { @@ -173,11 +177,12 @@ namespace Myshipping.Application.Service.BookingOrder queryInfo.stuffingVolume = model.stuffingVolume; } - MSKAPISearchPoint2PointScheduleResultDto resultInfo = null; - - var jsonBody = Newtonsoft.Json.JsonConvert.SerializeObject(queryInfo); + var jsonBody = Newtonsoft.Json.JsonConvert.SerializeObject(queryInfo, Formatting.Indented, new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore + }); var rlt = await queryUrl.SetBody(jsonBody) .PostAsStringAsync(); @@ -203,80 +208,264 @@ namespace Myshipping.Application.Service.BookingOrder if (resultInfo != null && resultInfo.code == 200 && resultInfo.data != null && resultInfo.data.Count > 0) { - resultInfo.data.ForEach(a => + resultInfo.data.ForEach(t => { - a.transportSchedules.ForEach(b => + t.transportSchedules.ForEach(a => { - SearchShipSailingScheduleResultDto info = new SearchShipSailingScheduleResultDto - { - carrierProductId = a.carrierProductId, - carrierProductSequenceId = a.carrierProductSequenceId, - ETD = b.departureDateTime, - ATD = b.arrivalDateTime, - vesselOperatorCarrierCode = b.vesselOperatorCarrierCode - }; + a.originGeoId = model.carrierCollectionOriginGeoID; + a.originUnLocCode = model.collectionOriginUNLocationCode; + a.originRegionName = model.collectionOriginUNRegionName; + a.originCityName = model.collectionOriginCityName; + a.originCountryName = model.collectionOriginCountryName; + + a.destinationGeoId = model.carrierDeliveryDestinationGeoID; + a.destinationUnLocCode = model.deliveryDestinationUNLocationCode; + a.destinationRegionName = model.deliveryDestinationUNRegionName; + a.destinationCityName = model.deliveryDestinationCityName; + a.destinationCountryName = model.deliveryDestinationCountryName; + + CacheShipSailingSchedule(a).GetAwaiter().GetResult(); + }); - if (b.departureDateTime.HasValue && b.arrivalDateTime.HasValue) - { - TimeSpan ts = b.arrivalDateTime.Value.Subtract(b.departureDateTime.Value); - var timeDiff = ts.TotalHours; + var currList = t.transportSchedules.Select(a => + { + return GetShipScheduleShow(a); + }).ToList(); - info.days = (int)Math.Ceiling(timeDiff / 24.0); - } + if (currList.Count > 0) + list.AddRange(currList); + }); + } + } + catch (Exception ex) + { + _logger.LogError($"检索海运船期详情异常，req={JSON.Serialize(model)} 原因：{ex.Message}"); - if (b.facilities != null) - { - info.orignCityName = b.facilities.collectionOrigin?.cityName; - info.orignCarrierSiteGeoID = b.facilities.collectionOrigin?.carrierSiteGeoID; - info.orignLocationName = b.facilities.collectionOrigin?.locationName; - info.orignCountryCode = b.facilities.collectionOrigin?.countryCode; - info.orignLocationType = b.facilities.collectionOrigin?.locationType; - info.orignUNLocationCode = b.facilities.collectionOrigin?.UNLocationCode; - info.orignUNRegionCode = b.facilities.collectionOrigin?.UNRegionCode; - - info.deliveryCityName = b.facilities.deliveryDestination?.cityName; - info.deliveryCarrierSiteGeoID = b.facilities.deliveryDestination?.carrierSiteGeoID; - info.deliveryLocationName = b.facilities.deliveryDestination?.locationName; - info.deliveryCountryCode = b.facilities.deliveryDestination?.countryCode; - info.deliveryLocationType = b.facilities.deliveryDestination?.locationType; - info.deliveryUNLocationCode = b.facilities.deliveryDestination?.UNLocationCode; - info.deliveryUNRegionCode = b.facilities.deliveryDestination?.UNRegionCode; - } + throw Oops.Bah($"检索海运船期详情失败，{ex.Message}"); + } - info.vesselIMONumber = b.firstDepartureVessel?.vesselIMONumber; - info.carrierVesselCode = b.firstDepartureVessel?.carrierVesselCode; - info.vesselName = b.firstDepartureVessel?.vesselName; + return list; + } + #endregion - if (b.transportLegs != null && b.transportLegs.Count > 0) - { - var firstTransportLegs = b.transportLegs.FirstOrDefault(); + #region 组织返回船期数据 + /// + /// 组织返回船期数据 + /// + /// 查询的船期详情 + /// 返回显示的船期数据 + private SearchShipSailingScheduleResultDto GetShipScheduleShow(MSKAPISearchTransportSchedules model) + { - if (firstTransportLegs.transport != null) - { - info.transportMode = firstTransportLegs.transport.transportMode; - info.carrierDepartureVoyageNumber = firstTransportLegs.transport.carrierDepartureVoyageNumber; - } + SearchShipSailingScheduleResultDto showDto = new SearchShipSailingScheduleResultDto + { + PId = model.PId, + MD5 = model.MD5, - } + orignCarrierCityGeoID = model.originGeoId, + orignUNLocationCode = model.originUnLocCode, + orignCityName = model.originCityName, + originRegionName = model.originRegionName, + originCountryName = model.originCountryName, - info.transportLegs = b.transportLegs; + deliveryCarrierCityGeoID = model.destinationGeoId, + deliveryUNLocationCode = model.destinationUnLocCode, + deliveryCityName = model.destinationCityName, + deliveryRegionName = model.destinationRegionName, + deliveryCountryName = model.destinationCountryName, - list.Add(info); - }); - }); - } + vesselName = model.firstDepartureVessel.vesselName, + carrierDepartureVoyageNumber = model.transportLegs.FirstOrDefault().transport.carrierDepartureVoyageNumber, + + Legs = new List() + }; + + //ETD + if (model.departureDateTime.HasValue) + { + showDto.ETD = model.departureDateTime.Value; } - catch (Exception ex) + else { - _logger.LogError($"检索海运船期详情异常，req={JSON.Serialize(model)} 原因：{ex.Message}"); + throw Oops.Bah($"查询船期错误，预计离港日期查询为空"); + } - throw Oops.Bah($"检索海运船期详情失败，{ex.Message}"); + //ETA + if (model.arrivalDateTime.HasValue) + { + showDto.ETA = model.arrivalDateTime.Value; + } + else + { + throw Oops.Bah($"查询船期错误，预计到港日期查询为空"); } - return list; + //计算预计天数 + if (showDto.ETD.HasValue && showDto.ETD.HasValue) + { + TimeSpan ts = showDto.ETA.Value.Subtract(showDto.ETD.Value); + var timeDiff = ts.TotalHours; + + showDto.days = (int)Math.Ceiling(timeDiff / 24.0); + } + + if (model.transportLegs.Count > 1) + showDto.isTransfer = true; + + //Legs + if (model.facilities != null) + { + showDto.orignCountryCode = model.facilities.collectionOrigin.countryCode; + showDto.deliveryCountryCode = model.facilities.deliveryDestination.countryCode; + + var legs = new List(); + + for (int i = 0; i < model.transportLegs.Count; i++) + { + var b = model.transportLegs[i]; + + MSKAPISPOTScheduleRateResultShowLegsDto leg = new MSKAPISPOTScheduleRateResultShowLegsDto + { + vesselName = b.transport.vessel.vesselName, + VoyageNo = b.transport.carrierDepartureVoyageNumber, + From = new MSKAPISPOTScheduleRateResultShowLegsLocationDto + { + CityName = b.facilities.startLocation.cityName, + CountryCode = b.facilities.startLocation.countryCode, + SiteGeoId = b.facilities.startLocation.carrierSiteGeoID, + LocationType = "From", + }, + To = new MSKAPISPOTScheduleRateResultShowLegsLocationDto + { + CityName = b.facilities.endLocation.cityName, + CountryCode = b.facilities.endLocation.countryCode, + SiteGeoId = b.facilities.endLocation.carrierSiteGeoID, + LocationType = "To", + } + }; + + //ETD + if (b.departureDateTime.HasValue) + { + showDto.ETD = b.departureDateTime.Value; + } + else + { + throw Oops.Bah($"查询船期错误，预计离港日期查询为空"); + } + + //ETA + if (b.arrivalDateTime.HasValue) + { + showDto.ETA = b.arrivalDateTime.Value; + } + else + { + throw Oops.Bah($"查询船期错误，预计到港日期查询为空"); + } + + leg.SortNo = i + 1; + leg.From.SiteGeoId = b.facilities.startLocation.carrierSiteGeoID; + leg.From.CityName = b.facilities.startLocation.cityName; + leg.From.CountryCode = b.facilities.startLocation.countryCode; + leg.From.UnLocCode = b.facilities.startLocation.UNLocationCode; + + leg.To.SiteGeoId = b.facilities.endLocation.carrierSiteGeoID; + leg.To.CityName = b.facilities.endLocation.cityName; + leg.To.CountryCode = b.facilities.endLocation.countryCode; + leg.To.UnLocCode = b.facilities.endLocation.UNLocationCode; + + if (i == 0 && i == model.transportLegs.Count - 1) + { + leg.From.CityGeoId = model.originGeoId; + leg.From.CountryName = model.originCountryName; + leg.From.RegionName = model.originRegionName; + + leg.To.CityGeoId= model.destinationGeoId; + leg.To.CountryName = model.destinationCountryName; + leg.To.RegionName = model.destinationRegionName; + } + else + { + if(i == 0) + { + leg.From.CityGeoId = model.originGeoId; + leg.From.CountryName = model.originCountryName; + leg.From.RegionName = model.originRegionName; + leg.From.UnLocCode = model.originUnLocCode; + } + else if(i == model.transportLegs.Count - 1) + { + leg.To.CityGeoId = model.destinationGeoId; + leg.To.CountryName = model.destinationCountryName; + leg.To.RegionName = model.destinationRegionName; + leg.To.UnLocCode = model.destinationUnLocCode; + } + } + + legs.Add(leg); + } + + + showDto.Legs = legs.OrderBy(t => t.ETD).Select((t, idx) => { + t.SortNo = idx + 1; + return t; + }).ToList(); + } + + return showDto; + } + #endregion + + #region 缓存船期数据 + /// + /// 缓存船期数据 + /// + /// 船期查询结果明细 + /// 船期类型 MSKSPOT-马士基即期 + /// 返回主键ID + private async Task CacheShipSailingSchedule(MSKAPISearchTransportSchedules model, string busiType = "MSKCON") + { + /* + 1、按照船期明细缓存，并把ID作为缓存的KEY + 2、对数据进行JSON串行化的文本提取MD5 + 3、写入缓存，并返回ID + */ + var newModel = model.Adapt(); + + //newModel.priceID = null; + + var json = Newtonsoft.Json.JsonConvert.SerializeObject(newModel); + model.PId = YitIdHelper.NextId(); + + string md5 = json.ToMd5(); + + model.MD5 = md5; + + var shareKey = model.PId.ToString(); + + DateTime nowDate = DateTime.Now; + DateTime expireDateTime = DateTime.Now.AddHours(4); + + var expireTimeSpan = expireDateTime.Subtract(nowDate).Duration(); + + if (!_cache.Exists($"{shareKey}_{busiType}")) + { + await _cache.SetTimeoutAsync($"{shareKey}_{busiType}", Newtonsoft.Json.JsonConvert.SerializeObject(model), expireTimeSpan); + } } #endregion + private MSKAPISearchPoint2PointScheduleResultDataDto GetCacheShipSailingSchedule(long pid, string busiType = "MSKCON") + { + if (_cache.Exists($"{pid}_{busiType}")) + { + return _cache.Get($"{pid}_{busiType}"); + } + + return null; + } + #region 发送马士基订舱请求 /// /// 发送马士基订舱请求 diff --git a/Myshipping.Application/Service/BookingOrder/Dto/MSKAPI/MSKAPISearchPoint2PointScheduleResultDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/MSKAPI/MSKAPISearchPoint2PointScheduleResultDto.cs index 54009e9d..65062999 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/MSKAPI/MSKAPISearchPoint2PointScheduleResultDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/MSKAPI/MSKAPISearchPoint2PointScheduleResultDto.cs @@ -58,6 +58,7 @@ namespace Myshipping.Application /// 产品从原产地到目的地的链接数 /// public List transportSchedules { get; set; } + } /// @@ -99,7 +100,103 @@ namespace Myshipping.Application /// 承运人代码(MAEU, SEAU, SEJJ, MCPU, MAEI) /// public string vesselOperatorCarrierCode { get; set; } -} + + //以下的字段是自己添加的不是船期返回的信息 + /// + /// 产品id + /// + public string carrierProductId { get; set; } + + /// + /// 产品序号 + /// + public string carrierProductSequenceId { get; set; } + + /// + /// 产品的生效日期，格式为YYYY-MM-DD + /// + public string productValidFromDate { get; set; } + + /// + /// 产品的截止日期，格式为YYYY-MM-DD + /// + public string productValidToDate { get; set; } + + /// + /// 产品从原产地到目的地的链接数 + /// + public string numberOfProductLinks { get; set; } + + /// + /// 船期MD5 + /// + public string MD5 { get; set; } + + /// + /// 主键ID + /// + public long PId { get; set; } + + /// + /// 起运地rkst代码 + /// + public string originRkstCode { get; set; } + + /// + /// 起运地geoID + /// + public string originGeoId { get; set; } + + /// + /// 起运地五子码 + /// + public string originUnLocCode { get; set; } + + /// + /// 起运地城市名 + /// + public string originCityName { get; set; } + + /// + /// 起运地区名 + /// + public string originRegionName { get; set; } + + /// + /// 起运地国家名 + /// + public string originCountryName { get; set; } + + /// + /// 目的地rkst代码 + /// + public string destinationRkstCode { get; set; } + + /// + /// 目的地geoID + /// + public string destinationGeoId { get; set; } + + /// + /// 目的地五子码 + /// + public string destinationUnLocCode { get; set; } + + /// + /// 目的地城市名 + /// + public string destinationCityName { get; set; } + + /// + /// 目的地区名 + /// + public string destinationRegionName { get; set; } + + /// + /// 目的地国家名 + /// + public string destinationCountryName { get; set; } + } /// /// 路线相关数据 diff --git a/Myshipping.Application/Service/BookingOrder/Dto/QueryShipSailingScheduleDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/QueryShipSailingScheduleDto.cs index c5ad3cb9..33292a08 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/QueryShipSailingScheduleDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/QueryShipSailingScheduleDto.cs @@ -36,6 +36,11 @@ namespace Myshipping.Application /// public string collectionOriginCityName { get; set; } + /// + /// 起始地国家名称（英文） + /// + public string collectionOriginCountryName { get; set; } + /// /// 起始地五字码 /// @@ -46,6 +51,11 @@ namespace Myshipping.Application /// public string collectionOriginUNRegionCode { get; set; } + /// + /// 起始地区名称 + /// + public string collectionOriginUNRegionName { get; set; } + /// /// 目的地国家代码 二字码 /// @@ -56,6 +66,11 @@ namespace Myshipping.Application /// public string deliveryDestinationCityName { get; set; } + /// + /// 目的地国家名称 二字码 + /// + public string deliveryDestinationCountryName { get; set; } + /// /// 目的都五字码 /// @@ -66,6 +81,11 @@ namespace Myshipping.Application /// public string deliveryDestinationUNRegionCode { get; set; } + /// + /// 目的地区名称 + /// + public string deliveryDestinationUNRegionName { get; set; } + /// /// 承运人代码（MAEU, SEAU, SEJJ, MCPU, MAEI） /// diff --git a/Myshipping.Application/Service/BookingOrder/Dto/SearchShipSailingScheduleResultDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/SearchShipSailingScheduleResultDto.cs index 2fbc4dfd..962ba46b 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/SearchShipSailingScheduleResultDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/SearchShipSailingScheduleResultDto.cs @@ -9,7 +9,7 @@ namespace Myshipping.Application /// /// 查询船期回执 /// - public class SearchShipSailingScheduleResultDto + public class SearchShipSailingScheduleResultDto : MSKAPISPOTScheduleRateResultShowDto { /// /// 产品id @@ -22,124 +22,63 @@ namespace Myshipping.Application public string carrierProductSequenceId { get; set; } /// - /// ETD + /// 起运地rkst代码 /// - public Nullable ETD { get; set; } + public string originRkstCode { get; set; } /// - /// ATD + /// 起运地geoID /// - public Nullable ATD { get; set; } + public string originGeoId { get; set; } /// - /// 城市名(始发地) + /// 起运地五子码 /// - public string orignCityName { get; set; } + public string originUnLocCode { get; set; } /// - /// 地点的GEO ID(始发地) + /// 起运地城市名 /// - public string orignCarrierSiteGeoID { get; set; } + public string originCityName { get; set; } /// - /// 地点的名称(始发地) + /// 起运地区名 /// - public string orignLocationName { get; set; } + public string originRegionName { get; set; } /// - /// 国家代码(始发地) + /// 起运地国家名 /// - public string orignCountryCode { get; set; } + public string originCountryName { get; set; } /// - /// 位置类型(始发地) + /// 目的地rkst代码 /// - public string orignLocationType { get; set; } + public string destinationRkstCode { get; set; } /// - /// 五字码(始发地) + /// 目的地geoID /// - public string orignUNLocationCode { get; set; } + public string destinationGeoId { get; set; } /// - /// 区代码(始发地) + /// 目的地五子码 /// - public string orignUNRegionCode { get; set; } + public string destinationUnLocCode { get; set; } /// - /// 城市名(目的地) + /// 目的地城市名 /// - public string deliveryCityName { get; set; } + public string destinationCityName { get; set; } /// - /// 地点的GEO ID(目的地) + /// 目的地区名 /// - public string deliveryCarrierSiteGeoID { get; set; } + public string destinationRegionName { get; set; } /// - /// 地点的名称(目的地) + /// 目的地国家名 /// - public string deliveryLocationName { get; set; } - - /// - /// 国家代码(目的地) - /// - public string deliveryCountryCode { get; set; } - - /// - /// 位置类型(目的地) - /// - public string deliveryLocationType { get; set; } - - /// - /// 五字码(目的地) - /// - public string deliveryUNLocationCode { get; set; } - - /// - /// 区代码(目的地) - /// - public string deliveryUNRegionCode { get; set; } - - - /// - /// IMO - /// - public string vesselIMONumber { get; set; } - - /// - /// 航次号 - /// - public string carrierVesselCode { get; set; } - - /// - /// 运输方式 - /// - public string transportMode { get; set; } - - /// - /// 船名 - /// - public string vesselName { get; set; } - - /// - /// 航次代码 - /// - public string carrierDepartureVoyageNumber { get; set; } - - /// - /// 承运人代码(MAEU, SEAU, SEJJ, MCPU, MAEI) - /// - public string vesselOperatorCarrierCode { get; set; } - - /// - /// 行程天数 - /// - public int days { get; set; } - - /// - /// 详细行程 - /// - public List transportLegs { get; set; } + public string destinationCountryName { get; set; } } } diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index aeeb19f5..494dd58f 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -14353,6 +14353,26 @@ 备注 + + + 备案代码 + + + + + 备案全称 + + + + + 联系人 + + + + + 联系邮箱 + + 网站账号维护新增输入参数 diff --git a/Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs b/Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs index c8b1f5dc..7fa0ee89 100644 --- a/Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs +++ b/Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs @@ -28,8 +28,26 @@ namespace Myshipping.Core.Service /// 备注 /// public virtual string Remark { get; set; } - - + + /// + /// 备案代码 + /// + public string RegistPartyCode { get; set; } + + /// + /// 备案全称 + /// + public string RegistPartyName { get; set; } + + /// + /// 联系人 + /// + public string RegistContractName { get; set; } + + /// + /// 联系邮箱 + /// + public string RegistContractEmail { get; set; } } ///