whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Browse Source
master
wanghaomei 5 months ago
parent ab87665c7e c759a142a8
commit 95413858ab
19 changed files with 901 additions and 226 deletions
Show Stats Download Patch File Download Diff File

112
Myshipping.Application/Service/BookingOrder/BookingCOSCOService.cs
Unescape Escape View File

@ -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);
//});
});
}
}

637
Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs
Unescape Escape View File

@ -24,6 +24,11 @@ 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;
using System.Threading;
namespace Myshipping.Application.Service.BookingOrder
{
@ -35,6 +40,8 @@ namespace Myshipping.Application.Service.BookingOrder
{
private readonly SqlSugarRepository<BookingDeliveryRecord> _bookingDeliveryRecordRep;
private readonly SqlSugarRepository<BookingDeliveryRecordCtn> _bookingDeliveryRecordCtnRep;
private readonly SqlSugarRepository<BookingDeliveryRecordShipSchedule> _bookingDeliveryRecordShipScheduleRep;
private readonly ISysCacheService _cache;
private readonly IDjyWebsiteAccountConfigService _webAccountConfig;
private readonly ILogger<BookingMSKAPIService> _logger;
@ -48,7 +55,7 @@ namespace Myshipping.Application.Service.BookingOrder
public BookingMSKAPIService(ILogger<BookingMSKAPIService> logger, ISysCacheService cache,
IDjyWebsiteAccountConfigService webAccountConfig, SqlSugarRepository<BookingDeliveryRecord> bookingDeliveryRecordRep,
ISysDataUserMenu sysDataUserMenuService,
SqlSugarRepository<BookingDeliveryRecordCtn> bookingDeliveryRecordCtnRep)
SqlSugarRepository<BookingDeliveryRecordCtn> bookingDeliveryRecordCtnRep, SqlSugarRepository<BookingDeliveryRecordShipSchedule> bookingDeliveryRecordShipScheduleRep)
{
_logger = logger;
_cache = cache;
@ -56,6 +63,7 @@ namespace Myshipping.Application.Service.BookingOrder
_bookingDeliveryRecordRep = bookingDeliveryRecordRep;
_bookingDeliveryRecordCtnRep = bookingDeliveryRecordCtnRep;
_sysDataUserMenuService = sysDataUserMenuService;
_bookingDeliveryRecordShipScheduleRep = bookingDeliveryRecordShipScheduleRep;
}
#region 检索海运船期详情
@ -173,11 +181,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 +212,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 =>
{
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();
});
var currList = t.transportSchedules.Select(a =>
{
SearchShipSailingScheduleResultDto info = new SearchShipSailingScheduleResultDto
return GetShipScheduleShow(a);
}).ToList();
if (currList.Count > 0)
list.AddRange(currList);
});
}
}
catch (Exception ex)
{
carrierProductId = a.carrierProductId,
carrierProductSequenceId = a.carrierProductSequenceId,
ETD = b.departureDateTime,
ATD = b.arrivalDateTime,
vesselOperatorCarrierCode = b.vesselOperatorCarrierCode
_logger.LogError($"检索海运船期详情异常，req={JSON.Serialize(model)} 原因：{ex.Message}");
throw Oops.Bah($"检索海运船期详情失败，{ex.Message}");
}
return list;
}
#endregion
#region 组织返回船期数据
/// <summary>
/// 组织返回船期数据
/// </summary>
/// <param name="model">查询的船期详情</param>
/// <returns>返回显示的船期数据</returns>
private SearchShipSailingScheduleResultDto GetShipScheduleShow(MSKAPISearchTransportSchedules model)
{
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,
deliveryCarrierCityGeoID = model.destinationGeoId,
deliveryUNLocationCode = model.destinationUnLocCode,
deliveryCityName = model.destinationCityName,
deliveryRegionName = model.destinationRegionName,
deliveryCountryName = model.destinationCountryName,
vesselName = model.firstDepartureVessel.vesselName,
carrierDepartureVoyageNumber = model.transportLegs.FirstOrDefault().transport.carrierDepartureVoyageNumber,
Legs = new List<MSKAPISPOTScheduleRateResultShowLegsDto>()
};
if (b.departureDateTime.HasValue && b.arrivalDateTime.HasValue)
//ETD
if (model.departureDateTime.HasValue)
{
TimeSpan ts = b.arrivalDateTime.Value.Subtract(b.departureDateTime.Value);
var timeDiff = ts.TotalHours;
showDto.ETD = model.departureDateTime.Value;
}
else
{
throw Oops.Bah($"查询船期错误，预计离港日期查询为空");
}
info.days = (int)Math.Ceiling(timeDiff / 24.0);
//ETA
if (model.arrivalDateTime.HasValue)
{
showDto.ETA = model.arrivalDateTime.Value;
}
else
{
throw Oops.Bah($"查询船期错误，预计到港日期查询为空");
}
if (b.facilities != null)
//计算预计天数
if (showDto.ETD.HasValue && showDto.ETD.HasValue)
{
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;
TimeSpan ts = showDto.ETA.Value.Subtract(showDto.ETD.Value);
var timeDiff = ts.TotalHours;
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;
showDto.days = (int)Math.Ceiling(timeDiff / 24.0);
}
info.vesselIMONumber = b.firstDepartureVessel?.vesselIMONumber;
info.carrierVesselCode = b.firstDepartureVessel?.carrierVesselCode;
info.vesselName = b.firstDepartureVessel?.vesselName;
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<MSKAPISPOTScheduleRateResultShowLegsDto>();
for (int i = 0; i < model.transportLegs.Count; i++)
{
var b = model.transportLegs[i];
if (b.transportLegs != null && b.transportLegs.Count > 0)
MSKAPISPOTScheduleRateResultShowLegsDto leg = new MSKAPISPOTScheduleRateResultShowLegsDto
{
vesselName = b.transport.vessel.vesselName,
VoyageNo = b.transport.carrierDepartureVoyageNumber,
From = new MSKAPISPOTScheduleRateResultShowLegsLocationDto
{
var firstTransportLegs = b.transportLegs.FirstOrDefault();
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",
}
};
if (firstTransportLegs.transport != null)
//ETD
if (b.departureDateTime.HasValue)
{
info.transportMode = firstTransportLegs.transport.transportMode;
info.carrierDepartureVoyageNumber = firstTransportLegs.transport.carrierDepartureVoyageNumber;
showDto.ETD = b.departureDateTime.Value;
}
else
{
throw Oops.Bah($"查询船期错误，预计离港日期查询为空");
}
//ETA
if (b.arrivalDateTime.HasValue)
{
showDto.ETA = b.arrivalDateTime.Value;
}
else
{
throw Oops.Bah($"查询船期错误，预计到港日期查询为空");
}
info.transportLegs = b.transportLegs;
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;
list.Add(info);
});
});
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;
}
catch (Exception ex)
else if(i == model.transportLegs.Count - 1)
{
_logger.LogError($"检索海运船期详情异常，req={JSON.Serialize(model)} 原因：{ex.Message}");
leg.To.CityGeoId = model.destinationGeoId;
leg.To.CountryName = model.destinationCountryName;
leg.To.RegionName = model.destinationRegionName;
leg.To.UnLocCode = model.destinationUnLocCode;
}
}
throw Oops.Bah($"检索海运船期详情失败，{ex.Message}");
legs.Add(leg);
}
return list;
showDto.Legs = legs.OrderBy(t => t.ETD).Select((t, idx) => {
t.SortNo = idx + 1;
return t;
}).ToList();
}
return showDto;
}
#endregion
#region 缓存船期数据
/// <summary>
/// 缓存船期数据
/// </summary>
/// <param name="model">船期查询结果明细</param>
/// <param name="busiType">船期类型 MSKSPOT-马士基即期</param>
/// <returns>返回主键ID</returns>
private async Task CacheShipSailingSchedule(MSKAPISearchTransportSchedules model, string busiType = "MSKCON")
{
/*
1、按照船期明细缓存，并把ID作为缓存的KEY
2、对数据进行JSON串行化的文本提取MD5
3、写入缓存，并返回ID
*/
var newModel = model.Adapt<MSKAPISearchTransportSchedules>();
//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 MSKAPISearchTransportSchedules GetCacheShipSailingSchedule(long pid, string busiType = "MSKCON")
{
if (_cache.Exists($"{pid}_{busiType}"))
{
return _cache.Get<MSKAPISearchTransportSchedules>($"{pid}_{busiType}");
}
return null;
}
#region 发送马士基订舱请求
/// <summary>
/// 发送马士基订舱请求
@ -338,6 +531,37 @@ namespace Myshipping.Application.Service.BookingOrder
//这里是校验必填项
ValidateMSKAPIData(model);
BookingDeliveryRecordShipSchedule shipScheduleRecord = null;
MSKAPISearchTransportSchedules selectedShipSchedule = null;
if (model.PId == 0)
throw Oops.Oh("船期信息不能为空，请重新检索船期");
if (model.PId > 0)
{
if (model.id.HasValue && model.id.Value > 0)
{
var recordId = model.id.Value;
shipScheduleRecord = await _bookingDeliveryRecordShipScheduleRep.AsQueryable()
.FirstAsync(a => a.RECORD_ID == recordId && a.SHIP_RATE_PID != null &&
a.SHIP_RATE_PID.Value == model.PId && a.IsDeleted == false);
}
if (shipScheduleRecord == null)
{
selectedShipSchedule = GetCacheShipSailingSchedule(model.PId);
}
else
{
selectedShipSchedule = JSON.Deserialize<MSKAPISearchTransportSchedules>(shipScheduleRecord.SHIP_JSON);
}
if (selectedShipSchedule == null)
throw Oops.Oh("船期数据校验失败，请重新查询船期信息");
}
DateTime nowDate = DateTime.Now;
var recordInfo = model.Adapt<BookingDeliveryRecord>();
@ -400,15 +624,13 @@ namespace Myshipping.Application.Service.BookingOrder
{
placeOfReceipt = new MSKAPIBookingRouteDetailsBase
{
UNLocationCode = model.userPlaceOfReceiptUnLocCode
//: model.placeOfReceiptUnLocCode,
//cityName = model.placeOfReceiptCityName,
UNLocationCode = model.userPlaceOfReceiptUnLocCode,
maerskCityGeoId = selectedShipSchedule.originGeoId,
},
placeOfDelivery = new MSKAPIBookingRouteDetailsBase
{
UNLocationCode = model.userPlaceOfDeliveryUnLocCode
//: model.placeOfDeliveryUnLocCode,
//cityName = model.placeOfDeliveryCityName,
UNLocationCode = model.userPlaceOfDeliveryUnLocCode,
maerskCityGeoId = selectedShipSchedule.destinationGeoId,
},
selectedRoute = new MSKAPIBookingRoute
{
@ -445,11 +667,140 @@ namespace Myshipping.Application.Service.BookingOrder
}
};
//ETD
//if (!string.IsNullOrWhiteSpace(selectedShipSchedule.facilities.)
//{
// DateTime currDate = DateTime.MinValue;
// if (DateTime.TryParse($"{selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.date} {selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.time}", out currDate))
// {
// bookingDto.bookingBody.transport.earliestDepartureDate = currDate.ToString("yyyy-MM-ddTHH:mm:ss");
// }
// else
// {
// throw Oops.Bah($"查询船期错误，priceID={model.priceID} pid={model.PId} 预计离港日期departureDate={selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.date} {selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.time} 格式解析错误");
// }
//}
//if(!model.isSendNoSchedule)
//{
// bookingDto.bookingBody.transport.routeDetails.selectedRoute.routeScheduleId = model.carrierProductId;
//}
for (int i = 0; i < selectedShipSchedule.transportLegs.Count; i++)
{
var detail = selectedShipSchedule.transportLegs[i];
var currDto = new MSKAPIBookingSchedules();
//ETD
if (detail.departureDateTime.HasValue)
{
currDto.originDepartureDateTimeLocal = detail.departureDateTime.Value.ToString("yyyy-MM-ddTHH:mm:ss");
}
else
{
throw Oops.Bah($"查询船期错误，pid={model.PId} 预计离港日期departureDate 格式解析错误");
}
//ETA
if (detail.arrivalDateTime.HasValue)
{
currDto.destinationArrivalDateTimeLocal = detail.arrivalDateTime.Value.ToString("yyyy-MM-ddTHH:mm:ss");
}
else
{
throw Oops.Bah($"查询船期错误，pid={model.PId} 预计到港日期arrivalDateTime 格式解析错误");
}
currDto.transportMode = new MSKAPIBookingTransportMode
{
vessel = new MSKAPIBookingTransportModeVessel
{
name = detail.transport.vessel.vesselName,
maerskVesselCode = detail.transport.vessel.carrierVesselCode,
vesselIMONumber = detail.transport.vessel.vesselIMONumber
},
exportVoyageNumber = detail.transport.carrierDepartureVoyageNumber,
};
currDto.serviceCode = detail.transport.carrierServiceCode;
currDto.transportModeCode = detail.transport.transportMode;
//首个
if (i == 0)
{
currDto.startLocation = new MSKAPIBookingRouteDetailsBase
{
cityName = detail.facilities.startLocation.cityName,
ISOcountryCode = detail.facilities.startLocation.countryCode,
UNLocationCode = detail.facilities.startLocation.UNLocationCode,
maerskCityGeoId = selectedShipSchedule.originGeoId,
};
if (i == selectedShipSchedule.transportLegs.Count - 1)
{
currDto.endLocation = new MSKAPIBookingRouteDetailsBase
{
cityName = detail.facilities.endLocation.cityName,
ISOcountryCode = detail.facilities.endLocation.countryCode,
UNLocationCode = detail.facilities.endLocation.UNLocationCode,
maerskCityGeoId = selectedShipSchedule.destinationGeoId,
};
}
else
{
currDto.endLocation = new MSKAPIBookingRouteDetailsBase
{
cityName = detail.facilities.endLocation.cityName,
ISOcountryCode = detail.facilities.endLocation.countryCode,
UNLocationCode = detail.facilities.endLocation.UNLocationCode,
maerskSiteGeoId = detail.facilities.endLocation.carrierSiteGeoID,
};
}
}
else if (i == selectedShipSchedule.transportLegs.Count - 1)
{
currDto.startLocation = new MSKAPIBookingRouteDetailsBase
{
cityName = detail.facilities.startLocation.cityName,
ISOcountryCode = detail.facilities.startLocation.countryCode,
UNLocationCode = detail.facilities.startLocation.UNLocationCode,
maerskSiteGeoId = detail.facilities.startLocation.carrierSiteGeoID,
};
currDto.endLocation = new MSKAPIBookingRouteDetailsBase
{
cityName = detail.facilities.endLocation.cityName,
ISOcountryCode = detail.facilities.endLocation.countryCode,
UNLocationCode = detail.facilities.endLocation.UNLocationCode,
maerskCityGeoId = selectedShipSchedule.destinationGeoId,
};
}
else
{
currDto.startLocation = new MSKAPIBookingRouteDetailsBase
{
cityName = detail.facilities.startLocation.cityName,
ISOcountryCode = detail.facilities.startLocation.countryCode,
UNLocationCode = detail.facilities.startLocation.UNLocationCode,
maerskSiteGeoId = detail.facilities.startLocation.carrierSiteGeoID,
};
currDto.endLocation = new MSKAPIBookingRouteDetailsBase
{
cityName = detail.facilities.endLocation.cityName,
ISOcountryCode = detail.facilities.endLocation.countryCode,
UNLocationCode = detail.facilities.endLocation.UNLocationCode,
maerskSiteGeoId = detail.facilities.endLocation.carrierSiteGeoID,
};
}
bookingDto.bookingBody.transport.routeDetails.selectedRoute.bookingSchedules.Add(currDto);
}
bookingDto.bookingBody.cargo = new MSKAPIBookingCargo
{
commodityCode = model.commodityCode,
@ -1156,6 +1507,25 @@ namespace Myshipping.Application.Service.BookingOrder
}).ToList();
}
MSKAPISearchTransportSchedules selectedShipSchedule = null;
if (model.PId > 0)
{
var shipScheduleRecord = await _bookingDeliveryRecordShipScheduleRep.AsQueryable()
.FirstAsync(a => a.SHIP_RATE_PID != null && a.SHIP_RATE_PID.Value == model.PId);
if (shipScheduleRecord != null)
{
selectedShipSchedule = JSON.Deserialize<MSKAPISearchTransportSchedules>(shipScheduleRecord.SHIP_JSON);
if (selectedShipSchedule != null)
{
model.selectedShipScheduleShow = GetShipScheduleShow(selectedShipSchedule);
}
}
}
return model;
}
#endregion
@ -1188,6 +1558,42 @@ namespace Myshipping.Application.Service.BookingOrder
_logger.LogInformation($"获取请求马士基API订舱报文，JSON={JSON.Serialize(model)}");
BookingDeliveryRecordShipSchedule shipScheduleRecord = null;
MSKAPISearchTransportSchedules selectedShipSchedule = null;
if (model.PId > 0)
{
if (model.id.HasValue && model.id.Value > 0)
{
var recordId = model.id.Value;
shipScheduleRecord = await _bookingDeliveryRecordShipScheduleRep.AsQueryable()
.FirstAsync(a => a.RECORD_ID == recordId && a.SHIP_RATE_PID != null &&
a.SHIP_RATE_PID.Value == model.PId && a.IsDeleted == false);
}
if (shipScheduleRecord == null)
{
selectedShipSchedule = GetCacheShipSailingSchedule(model.PId);
}
else
{
selectedShipSchedule = JSON.Deserialize<MSKAPISearchTransportSchedules>(shipScheduleRecord.SHIP_JSON);
}
if (selectedShipSchedule == null)
throw Oops.Oh("船期数据校验失败，请重新查询船期信息");
model.placeOfReceiptCountryName = selectedShipSchedule.originCountryName;
model.placeOfReceiptRegionName = selectedShipSchedule.originRegionName;
model.carrierCollectionOriginGeoID = selectedShipSchedule.originGeoId;
model.placeOfDeliveryCountryName = selectedShipSchedule.destinationCountryName;
model.placeOfDeliveryRegionName = selectedShipSchedule.destinationRegionName;
model.carrierDeliveryDestinationGeoID = selectedShipSchedule.destinationGeoId;
}
if (model.ctns != null && model.ctns.Count > 0)
{
ctnStat = string.Join(",", model.ctns.GroupBy(a => a.ctnName)
@ -1218,6 +1624,8 @@ namespace Myshipping.Application.Service.BookingOrder
entity.UpdatedUserId = UserManager.UserId;
entity.UpdatedUserName = UserManager.Name;
entity.CTN_STAT = ctnStat;
entity.BOOKING_CHANNEL_TYPE = "CON_API";
entity.BOOKING_CHANNEL_TYPE_NAME = "合约API";
await _bookingDeliveryRecordRep.AsUpdateable(entity).IgnoreColumns(x => new
{
@ -1309,6 +1717,27 @@ namespace Myshipping.Application.Service.BookingOrder
}
}
if (shipScheduleRecord == null)
{
if (model.PId > 0 && selectedShipSchedule != null)
{
shipScheduleRecord = new BookingDeliveryRecordShipSchedule
{
Id = YitIdHelper.NextId(),
RECORD_ID = model.id.Value,
SHIP_RATE_PID = selectedShipSchedule.PId,
SHIP_RATE_MD5 = selectedShipSchedule.MD5,
SHIP_JSON = Newtonsoft.Json.JsonConvert.SerializeObject(selectedShipSchedule),
CreatedTime = nowDate,
UpdatedTime = nowDate,
CreatedUserId = UserManager.UserId,
CreatedUserName = UserManager.Name
};
await _bookingDeliveryRecordShipScheduleRep.InsertAsync(shipScheduleRecord);
}
}
return model.id.Value;
}
else
@ -1322,6 +1751,8 @@ namespace Myshipping.Application.Service.BookingOrder
entity.STATUS = "TEMP";
entity.STATUS_NAME = "暂存";
entity.CTN_STAT = ctnStat;
entity.BOOKING_CHANNEL_TYPE = "CON_API";
entity.BOOKING_CHANNEL_TYPE_NAME = "合约API";
await _bookingDeliveryRecordRep.InsertAsync(entity);
@ -1348,6 +1779,66 @@ namespace Myshipping.Application.Service.BookingOrder
});
}
if (shipScheduleRecord == null)
{
if (model.PId > 0 && selectedShipSchedule != null)
{
shipScheduleRecord = new BookingDeliveryRecordShipSchedule
{
Id = YitIdHelper.NextId(),
RECORD_ID = entity.Id,
SHIP_RATE_PID = selectedShipSchedule.PId,
SHIP_RATE_MD5 = selectedShipSchedule.MD5,
SHIP_JSON = Newtonsoft.Json.JsonConvert.SerializeObject(selectedShipSchedule),
CreatedTime = nowDate,
UpdatedTime = nowDate,
CreatedUserId = UserManager.UserId,
CreatedUserName = UserManager.Name
};
await _bookingDeliveryRecordShipScheduleRep.InsertAsync(shipScheduleRecord);
}
}
else
{
//只有船期发生变化时才重新写入新的船期记录
if (model.PId != shipScheduleRecord.SHIP_RATE_PID.Value)
{
_logger.LogInformation($"MSK CON id={model.id} 换了船期 原记录:{selectedShipSchedule.PId} 新记录:{model.PId} 作废原船期，插入新船期");
shipScheduleRecord.IsDeleted = true;
shipScheduleRecord.UpdatedTime = nowDate;
shipScheduleRecord.UpdatedUserId = UserManager.UserId;
shipScheduleRecord.UpdatedUserName = UserManager.Name;
await _bookingDeliveryRecordShipScheduleRep.AsUpdateable(shipScheduleRecord).UpdateColumns(x => new {
x.IsDeleted,
x.UpdatedUserId,
x.UpdatedUserName,
x.UpdatedTime
}).ExecuteCommandAsync();
shipScheduleRecord = new BookingDeliveryRecordShipSchedule
{
Id = YitIdHelper.NextId(),
RECORD_ID = model.id.Value,
SHIP_RATE_PID = selectedShipSchedule.PId,
SHIP_RATE_MD5 = selectedShipSchedule.MD5,
SHIP_JSON = Newtonsoft.Json.JsonConvert.SerializeObject(selectedShipSchedule),
CreatedTime = nowDate,
UpdatedTime = nowDate,
CreatedUserId = UserManager.UserId,
CreatedUserName = UserManager.Name
};
await _bookingDeliveryRecordShipScheduleRep.InsertAsync(shipScheduleRecord);
}
else
{
_logger.LogInformation($"MSK CON id={model.id} 船期没变化 model.PId={model.PId} shipScheduleRecord.SHIP_RATE_PID={shipScheduleRecord.SHIP_RATE_PID.Value}");
}
}
return entity.Id;
}
}
@ -1419,6 +1910,8 @@ namespace Myshipping.Application.Service.BookingOrder
failNum++;
}
Thread.Sleep(1000);
});
msgList.Add($"共计{totalNum} 条 成功{succNum}条 失败:{failNum}");
@ -1732,5 +2225,43 @@ namespace Myshipping.Application.Service.BookingOrder
return "校验成功";
}
#endregion
#region 获取初始化页面默认值
/// <summary>
/// 获取初始化页面默认值
/// </summary>
/// <returns>返回详情</returns>
[HttpGet("/BookingMSKAPI/GetInitInfo")]
public async Task<MSKSPOTBookingInitDto> GetInitInfo()
{
MSKSPOTBookingInitDto dto = null;
var webAccountConfig = await _webAccountConfig.GetAccountConfigByTenantId("MSKApi", UserManager.UserId, UserManager.TENANT_ID);
if (webAccountConfig == null)
throw Oops.Oh("未配置公司账户维护-MSK即期，请联系管理员");
if (string.IsNullOrWhiteSpace(webAccountConfig.RegistPartyCode)
|| string.IsNullOrWhiteSpace(webAccountConfig.RegistPartyName) || string.IsNullOrWhiteSpace(webAccountConfig.RegistContractName)
|| string.IsNullOrWhiteSpace(webAccountConfig.RegistContractEmail))
{
throw Oops.Oh("账户维护-MSK即期,未配置完整注册信息（备案代码、备案全称、联系人、邮箱必填），请联系管理员");
}
dto = new MSKSPOTBookingInitDto
{
bookedByMaerskPartyCode = webAccountConfig.RegistPartyCode,
bookedByCompanyName = webAccountConfig.RegistPartyName,
priceOwnerMaerskPartyCode = webAccountConfig.RegistPartyCode,
priceOwnerCompanyName = webAccountConfig.RegistPartyName,
bookedByCompanyContactName = webAccountConfig.RegistContractName,
bookedByCompanyContactEmail = webAccountConfig.RegistContractEmail,
priceOwnerContactName = webAccountConfig.RegistContractName,
priceOwnerContactEmail = webAccountConfig.RegistContractEmail,
};
return dto;
}
#endregion
}
}

30
Myshipping.Application/Service/BookingOrder/BookingMSKSPOTAPIService.cs
Unescape Escape View File

@ -22,6 +22,7 @@ using Yitter.IdGenerator;
using System.Diagnostics;
using Newtonsoft.Json;
using StackExchange.Profiling.Internal;
using System.Threading;
namespace Myshipping.Application.Service.BookingOrder
{
@ -118,7 +119,7 @@ namespace Myshipping.Application.Service.BookingOrder
{
userKey = App.Configuration["MSKAPIDjyUserKey"],
userSecret = App.Configuration["MSKAPIDjyUserSecret"],
operatingEnvironment = "PRODUCTION",//App.Configuration["MSKAPIOPEnvironment"],
operatingEnvironment = App.Configuration["MSKAPIOPEnvironment"],
spot_api_key = webAccountConfig.Account,
brandScac = model.carrierCode,
originPrefix = model.cityName
@ -244,7 +245,7 @@ namespace Myshipping.Application.Service.BookingOrder
{
userKey = App.Configuration["MSKAPIDjyUserKey"],
userSecret = App.Configuration["MSKAPIDjyUserSecret"],
operatingEnvironment = "PRODUCTION",//App.Configuration["MSKAPIOPEnvironment"],
operatingEnvironment = App.Configuration["MSKAPIOPEnvironment"],
spot_api_key = webAccountConfig.Account,
originServiceMode = model.originServiceMode,
destinationServiceMode = model.destinationServiceMode,
@ -623,7 +624,7 @@ namespace Myshipping.Application.Service.BookingOrder
throw Oops.Oh("未配置发送订舱请求接口地址，请联系管理员");
var webAccountConfig = _webAccountConfig
.GetAccountConfig("MSKSpotApi", UserManager.UserId).GetAwaiter().GetResult();
.GetAccountConfig("MSKApi", UserManager.UserId).GetAwaiter().GetResult();
if (webAccountConfig == null)
throw Oops.Oh("未配置个人账户，请先配置个人账户 类型-MSKApi");
@ -726,7 +727,7 @@ namespace Myshipping.Application.Service.BookingOrder
bookingDto.bookingBody.transport = new MSKAPIBookingTransport
{
carrierCode = model.carrierCode,
earliestDepartureDate = model.earliestDepartureDate.Value.ToString("yyyy-MM-ddTHH:mm:ss"),
//earliestDepartureDate = model.earliestDepartureDate.Value.ToString("yyyy-MM-ddTHH:mm:ss"),
exportServiceMode = model.exportServiceMode,
importServiceMode = model.importServiceMode,
routeDetails = new MSKAPIBookingRouteDetails
@ -748,6 +749,21 @@ namespace Myshipping.Application.Service.BookingOrder
}
};
//ETD
if (!string.IsNullOrWhiteSpace(selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.date))
{
DateTime currDate = DateTime.MinValue;
if (DateTime.TryParse($"{selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.date} {selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.time}", out currDate))
{
bookingDto.bookingBody.transport.earliestDepartureDate = currDate.ToString("yyyy-MM-ddTHH:mm:ss");
}
else
{
throw Oops.Bah($"查询船期错误，priceID={model.priceID} pid={model.PId} 预计离港日期departureDate={selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.date} {selectedShipSchedule.scheduleDetails.FirstOrDefault().fromLocation.time} 格式解析错误");
}
}
for (int i=0;i< selectedShipSchedule.scheduleDetails.Count;i++)
{
var detail = selectedShipSchedule.scheduleDetails[i];
@ -768,7 +784,7 @@ namespace Myshipping.Application.Service.BookingOrder
}
}
//ETD
//ETA
if (!string.IsNullOrWhiteSpace(detail.toLocation.date))
{
DateTime currDate = DateTime.MinValue;
@ -1229,7 +1245,7 @@ namespace Myshipping.Application.Service.BookingOrder
{
userKey = App.Configuration["MSKAPIDjyUserKey"],
userSecret = App.Configuration["MSKAPIDjyUserSecret"],
operatingEnvironment = "PRODUCTION",//App.Configuration["MSKAPIOPEnvironment"],
operatingEnvironment = App.Configuration["MSKAPIOPEnvironment"],
commodityName = model.commodityName,
mskAppKey = webAccountConfig.Account
};
@ -1737,6 +1753,8 @@ namespace Myshipping.Application.Service.BookingOrder
failNum++;
}
Thread.Sleep(1000);
});
msgList.Add($"共计{totalNum} 条 成功{succNum}条 失败:{failNum}");

2
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -12897,7 +12897,7 @@ namespace Myshipping.Application
public async Task<ReceiveBcInfoResultDto> ReceiveBookingReject(ReceiveBookingRejectInputDto input)
{
// 客户订舱：运营端发送订舱数据给客户端
if (App.Configuration["RunType"] == CommonConst.RUN_TYPE_DJY)
if (App.Configuration["RunType"] != CommonConst.RUN_TYPE_DJY)
{
return new ReceiveBcInfoResultDto(false, "非运营端，接收失败");
}

97
Myshipping.Application/Service/BookingOrder/Dto/MSKAPI/MSKAPISearchPoint2PointScheduleResultDto.cs
Unescape Escape View File

@ -58,6 +58,7 @@ namespace Myshipping.Application
/// 产品从原产地到目的地的链接数
/// </summary>
public List<MSKAPISearchTransportSchedules> transportSchedules { get; set; }
}
/// <summary>
@ -99,6 +100,102 @@ namespace Myshipping.Application
/// 承运人代码(MAEU, SEAU, SEJJ, MCPU, MAEI)
/// </summary>
public string vesselOperatorCarrierCode { get; set; }
//以下的字段是自己添加的不是船期返回的信息
/// <summary>
/// 产品id
/// </summary>
public string carrierProductId { get; set; }
/// <summary>
/// 产品序号
/// </summary>
public string carrierProductSequenceId { get; set; }
/// <summary>
/// 产品的生效日期，格式为YYYY-MM-DD
/// </summary>
public string productValidFromDate { get; set; }
/// <summary>
/// 产品的截止日期，格式为YYYY-MM-DD
/// </summary>
public string productValidToDate { get; set; }
/// <summary>
/// 产品从原产地到目的地的链接数
/// </summary>
public string numberOfProductLinks { get; set; }
/// <summary>
/// 船期MD5
/// </summary>
public string MD5 { get; set; }
/// <summary>
/// 主键ID
/// </summary>
public long PId { get; set; }
/// <summary>
/// 起运地rkst代码
/// </summary>
public string originRkstCode { get; set; }
/// <summary>
/// 起运地geoID
/// </summary>
public string originGeoId { get; set; }
/// <summary>
/// 起运地五子码
/// </summary>
public string originUnLocCode { get; set; }
/// <summary>
/// 起运地城市名
/// </summary>
public string originCityName { get; set; }
/// <summary>
/// 起运地区名
/// </summary>
public string originRegionName { get; set; }
/// <summary>
/// 起运地国家名
/// </summary>
public string originCountryName { get; set; }
/// <summary>
/// 目的地rkst代码
/// </summary>
public string destinationRkstCode { get; set; }
/// <summary>
/// 目的地geoID
/// </summary>
public string destinationGeoId { get; set; }
/// <summary>
/// 目的地五子码
/// </summary>
public string destinationUnLocCode { get; set; }
/// <summary>
/// 目的地城市名
/// </summary>
public string destinationCityName { get; set; }
/// <summary>
/// 目的地区名
/// </summary>
public string destinationRegionName { get; set; }
/// <summary>
/// 目的地国家名
/// </summary>
public string destinationCountryName { get; set; }
}
/// <summary>

25
Myshipping.Application/Service/BookingOrder/Dto/MSKBookingDto.cs
Unescape Escape View File

@ -27,6 +27,16 @@ namespace Myshipping.Application
/// </summary>
public long bookingId { get; set; }
/// <summary>
/// 主键ID
/// </summary>
public long PId { get; set; }
/// <summary>
/// 船期MD5
/// </summary>
public string MD5 { get; set; }
/// <summary>
/// 合同唯一id
/// </summary>
@ -360,6 +370,21 @@ namespace Myshipping.Application
/// 箱型箱量列表
/// </summary>
public List<MSKBookingCtnInfo> ctns { get; set; }
/// <summary>
/// 收货地定位ID
/// </summary>
public string carrierCollectionOriginGeoID { get; set; }
/// <summary>
/// 交货地定位ID
/// </summary>
public string carrierDeliveryDestinationGeoID { get; set; }
/// <summary>
/// 选择的船期详情
/// </summary>
public SearchShipSailingScheduleResultDto selectedShipScheduleShow { get; set; }
}
public class MSKBookingCtnInfo

20
Myshipping.Application/Service/BookingOrder/Dto/QueryShipSailingScheduleDto.cs
Unescape Escape View File

@ -36,6 +36,11 @@ namespace Myshipping.Application
/// </summary>
public string collectionOriginCityName { get; set; }
/// <summary>
/// 起始地国家名称（英文）
/// </summary>
public string collectionOriginCountryName { get; set; }
/// <summary>
/// 起始地五字码
/// </summary>
@ -46,6 +51,11 @@ namespace Myshipping.Application
/// </summary>
public string collectionOriginUNRegionCode { get; set; }
/// <summary>
/// 起始地区名称
/// </summary>
public string collectionOriginUNRegionName { get; set; }
/// <summary>
/// 目的地国家代码 二字码
/// </summary>
@ -56,6 +66,11 @@ namespace Myshipping.Application
/// </summary>
public string deliveryDestinationCityName { get; set; }
/// <summary>
/// 目的地国家名称 二字码
/// </summary>
public string deliveryDestinationCountryName { get; set; }
/// <summary>
/// 目的都五字码
/// </summary>
@ -66,6 +81,11 @@ namespace Myshipping.Application
/// </summary>
public string deliveryDestinationUNRegionCode { get; set; }
/// <summary>
/// 目的地区名称
/// </summary>
public string deliveryDestinationUNRegionName { get; set; }
/// <summary>
/// 承运人代码（MAEU, SEAU, SEJJ, MCPU, MAEI）
/// </summary>

111
Myshipping.Application/Service/BookingOrder/Dto/SearchShipSailingScheduleResultDto.cs
Unescape Escape View File

@ -9,7 +9,7 @@ namespace Myshipping.Application
/// <summary>
/// 查询船期回执
/// </summary>
public class SearchShipSailingScheduleResultDto
public class SearchShipSailingScheduleResultDto : MSKAPISPOTScheduleRateResultShowDto
{
/// <summary>
/// 产品id
@ -22,124 +22,63 @@ namespace Myshipping.Application
public string carrierProductSequenceId { get; set; }
/// <summary>
/// ETD
/// 起运地rkst代码
/// </summary>
public Nullable<DateTime> ETD { get; set; }
public string originRkstCode { get; set; }
/// <summary>
/// ATD
/// 起运地geoID
/// </summary>
public Nullable<DateTime> ATD { get; set; }
public string originGeoId { get; set; }
/// <summary>
/// 城市名(始发地)
/// 起运地五子码
/// </summary>
public string orignCityName { get; set; }
public string originUnLocCode { get; set; }
/// <summary>
/// 地点的GEO ID(始发地)
/// 起运地城市名
/// </summary>
public string orignCarrierSiteGeoID { get; set; }
public string originCityName { get; set; }
/// <summary>
/// 地点的名称(始发地)
/// 起运地区名
/// </summary>
public string orignLocationName { get; set; }
public string originRegionName { get; set; }
/// <summary>
/// 国家代码(始发地)
/// 起运地国家名
/// </summary>
public string orignCountryCode { get; set; }
public string originCountryName { get; set; }
/// <summary>
/// 位置类型(始发地)
/// 目的地rkst代码
/// </summary>
public string orignLocationType { get; set; }
public string destinationRkstCode { get; set; }
/// <summary>
/// 五字码(始发地)
/// 目的地geoID
/// </summary>
public string orignUNLocationCode { get; set; }
public string destinationGeoId { get; set; }
/// <summary>
/// 区代码(始发地)
/// 目的地五子码
/// </summary>
public string orignUNRegionCode { get; set; }
public string destinationUnLocCode { get; set; }
/// <summary>
/// 城市名(目的地)
/// 目的地城市名
/// </summary>
public string deliveryCityName { get; set; }
public string destinationCityName { get; set; }
/// <summary>
/// 地点的GEO ID(目的地)
/// 目的地区名
/// </summary>
public string deliveryCarrierSiteGeoID { get; set; }
public string destinationRegionName { get; set; }
/// <summary>
/// 地点的名称(目的地)
/// 目的地国家名
/// </summary>
public string deliveryLocationName { get; set; }
/// <summary>
/// 国家代码(目的地)
/// </summary>
public string deliveryCountryCode { get; set; }
/// <summary>
/// 位置类型(目的地)
/// </summary>
public string deliveryLocationType { get; set; }
/// <summary>
/// 五字码(目的地)
/// </summary>
public string deliveryUNLocationCode { get; set; }
/// <summary>
/// 区代码(目的地)
/// </summary>
public string deliveryUNRegionCode { get; set; }
/// <summary>
/// IMO
/// </summary>
public string vesselIMONumber { get; set; }
/// <summary>
/// 航次号
/// </summary>
public string carrierVesselCode { get; set; }
/// <summary>
/// 运输方式
/// </summary>
public string transportMode { get; set; }
/// <summary>
/// 船名
/// </summary>
public string vesselName { get; set; }
/// <summary>
/// 航次代码
/// </summary>
public string carrierDepartureVoyageNumber { get; set; }
/// <summary>
/// 承运人代码(MAEU, SEAU, SEJJ, MCPU, MAEI)
/// </summary>
public string vesselOperatorCarrierCode { get; set; }
/// <summary>
/// 行程天数
/// </summary>
public int days { get; set; }
/// <summary>
/// 详细行程
/// </summary>
public List<MSKTransportLegInfo> transportLegs { get; set; }
public string destinationCountryName { get; set; }
}
}

7
Myshipping.Application/Service/BookingOrder/IBookingMSKAPIService.cs
Unescape Escape View File

@ -102,5 +102,12 @@ namespace Myshipping.Application
/// <param name="opTypeName">操作类型 BC-同步BC状态 Cancellation-同步取消状态</param>
/// <returns>返回回执</returns>
Task<MSKBookingResultDto> SyncBCInfo(string mblno, long tenantId, string opTypeName = "BookingConfirmation");
/// <summary>
/// 获取初始化页面默认值
/// </summary>
/// <returns>返回详情</returns>
Task<MSKSPOTBookingInitDto> GetInitInfo();
}
}

2
Myshipping.Application/Service/TaskManagePlat/RouteChangeAdvisoryService.cs
Unescape Escape View File

@ -547,7 +547,7 @@ namespace Myshipping.Application
EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto
{
SendTo = toEmail,
CCTo = opEmail,
//CCTo = opEmail,
Title = emailTitle,
Body = emailHtml,
Account = publicMailAccount.MailAccount?.Trim(),

2
Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs
Unescape Escape View File

@ -1908,7 +1908,7 @@ namespace Myshipping.Application
EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto
{
SendTo = toEmail,
CCTo = opEmail,
//CCTo = opEmail,
Title = emailTitle,
Body = emailHtml,
Account = publicMailAccount.MailAccount?.Trim(),

2
Myshipping.Application/Service/TaskManagePlat/TaskManageCutDateChangeService.cs
Unescape Escape View File

@ -634,7 +634,7 @@ namespace Myshipping.Application
EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto
{
SendTo = toEmail,
CCTo = opEmail,
//CCTo = opEmail,
Title = emailTitle,
Body = emailHtml,
Account = publicMailAccount.MailAccount?.Trim(),

2
Myshipping.Application/Service/TaskManagePlat/TaskManageDRAFTService.cs
Unescape Escape View File

@ -368,7 +368,7 @@ namespace Myshipping.Application
EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto
{
SendTo = toEmail,
CCTo = opEmail,
//CCTo = opEmail,
Title = emailTitle,
Body = emailHtml,
Account = publicMailAccount.MailAccount?.Trim(),

2
Myshipping.Application/Service/TaskManagePlat/TaskManagePODDischargeGateoutFullService.cs
Unescape Escape View File

@ -560,7 +560,7 @@ namespace Myshipping.Application
EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto
{
SendTo = toEmail,
CCTo = opEmail,
//CCTo = opEmail,
Title = emailTitle,
Body = emailHtml,
Account = publicMailAccount.MailAccount?.Trim(),

2
Myshipping.Application/Service/TaskManagePlat/TaskManageRollingNominationService.cs
Unescape Escape View File

@ -1668,7 +1668,7 @@ namespace Myshipping.Application
EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto
{
SendTo = toEmail,
CCTo = opEmail,
//CCTo = opEmail,
Title = emailTitle,
Body = emailHtml,
Account = publicMailAccount.MailAccount?.Trim(),

2
Myshipping.Application/Service/TaskManagePlat/TaskPOLContainerNotPickUpService.cs
Unescape Escape View File

@ -403,7 +403,7 @@ namespace Myshipping.Application
EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto
{
SendTo = toEmail,
CCTo = opEmail,
//CCTo = opEmail,
Title = emailTitle,
Body = emailHtml,
Account = publicMailAccount.MailAccount?.Trim(),

2
Myshipping.Application/Service/TaskManagePlat/TaskTransPlanHasChangeService.cs
Unescape Escape View File

@ -661,7 +661,7 @@ namespace Myshipping.Application
EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto
{
SendTo = toEmail,
CCTo = opEmail,
//CCTo = opEmail,
Title = emailTitle,
Body = emailHtml,
Account = publicMailAccount.MailAccount?.Trim(),

20
Myshipping.Core/Myshipping.Core.xml
Unescape Escape View File

@ -14353,6 +14353,26 @@
备注
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyWebsiteAccountConfigInput.RegistPartyCode">
<summary>
备案代码
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyWebsiteAccountConfigInput.RegistPartyName">
<summary>
备案全称
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyWebsiteAccountConfigInput.RegistContractName">
<summary>
联系人
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyWebsiteAccountConfigInput.RegistContractEmail">
<summary>
联系邮箱
</summary>
</member>
<member name="T:Myshipping.Core.Service.AddDjyWebsiteAccountConfigInput">
<summary>
网站账号维护新增输入参数

18
Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs
Unescape Escape View File

@ -29,7 +29,25 @@ namespace Myshipping.Core.Service
/// </summary>
public virtual string Remark { get; set; }
/// <summary>
/// 备案代码
/// </summary>
public string RegistPartyCode { get; set; }
/// <summary>
/// 备案全称
/// </summary>
public string RegistPartyName { get; set; }
/// <summary>
/// 联系人
/// </summary>
public string RegistContractName { get; set; }
/// <summary>
/// 联系邮箱
/// </summary>
public string RegistContractEmail { get; set; }
}
/// <summary>

Write Preview
Loading…
Cancel
Save