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

冲突合并

Browse Source
booking_auth_dev
wanghaomei 2 years ago
parent b8e62b295a 8e77f46364
commit 695e351520
17 changed files with 899 additions and 44 deletions
Show Stats Download Patch File Download Diff File

5
Myshipping.Application/Entity/BookingStatusLogDetail.cs
Unescape Escape View File

@ -23,10 +23,7 @@ namespace Myshipping.Application.Entity
/// 箱号
/// </summary>
public string CNTRNO { get; set; }
/// <summary>
/// 提单号
/// </summary>
public string MBLNO { get; set; }
/// <summary>
/// 状态时间
/// </summary>

170
Myshipping.Application/Myshipping.Application.xml
Unescape Escape View File

@ -2320,11 +2320,6 @@
箱号
</summary>
</member>
<member name="P:Myshipping.Application.Entity.BookingStatusLogDetail.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Myshipping.Application.Entity.BookingStatusLogDetail.OPTime">
<summary>
状态时间
@ -3171,14 +3166,10 @@
<param name="Id"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Application.BookingOrderService.SendTrace(System.String,System.String,System.String)">
<member name="M:Myshipping.Application.BookingOrderService.SendTrace(System.String,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="M:Myshipping.Application.BookingOrderService.GenReportJson(System.Int64)">
<summary>
@ -3191,8 +3182,19 @@
生成报表文件
</summary>
<param name="id"></param>
<param name="type">类型，对应字典中的【订舱打印模板类型】</param>
<returns></returns>
</member>
<member name="M:Myshipping.Application.BookingOrderService.GetBookingStatusLog(System.Int64)">
<summary>
获取货运动态
</summary>
</member>
<member name="M:Myshipping.Application.BookingOrderService.AddBookingStatusLog(System.Collections.Generic.List{Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto})">
<summary>
插入货运动态
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingLogDto.Type">
<summary>
操作类型（新增，编辑）
@ -3233,6 +3235,56 @@
备注
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.BookingId">
<summary>
业务id
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.Status">
<summary>
状态
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.OpTiem">
<summary>
状态时间
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.Gategory">
<summary>
类别
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.Type">
<summary>
状态分类
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDetailDto.PId">
<summary>
主单id
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDetailDto.Status">
<summary>
状态
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDetailDto.CNTRNO">
<summary>
箱号
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDetailDto.OPTime">
<summary>
状态时间
</summary>
</member>
<member name="T:Myshipping.Application.BookingOrderDto">
<summary>
订舱主表输出参数
@ -5852,6 +5904,66 @@
扩展信息2
</summary>
</member>
<member name="T:Myshipping.Application.RulesEngineExcuteResultDetailDto">
<summary>
规则执行结果明细
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDetailDto.IsSuccess">
<summary>
当前规则是否校验成功 true-成功 false-失败
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDetailDto.ResultCode">
<summary>
返回代码
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDetailDto.ResultName">
<summary>
返回名称
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDetailDto.ErrorType">
<summary>
规则提醒类型 Error-错误 Warning-提醒
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDetailDto.RuleName">
<summary>
规则名称
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDetailDto.WFName">
<summary>
规则集名称
</summary>
</member>
<member name="T:Myshipping.Application.RulesEngineExcuteResultDto">
<summary>
规则执行结果
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDto.succ">
<summary>
是否成功 true=成功 false=失败
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDto.status">
<summary>
状态 0-成功
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDto.msg">
<summary>
返回消息
</summary>
</member>
<member name="P:Myshipping.Application.RulesEngineExcuteResultDto.rows">
<summary>
返回校验明细
</summary>
</member>
<member name="T:Myshipping.Application.RulesEngineWebAPIHeadBase">
<summary>
规则平台请求报文头（HEAD）
@ -5912,30 +6024,58 @@
请求操作类型
</summary>
</member>
<member name="M:Myshipping.Application.IRulesEngineClientService.ExcuteRulesEngineOceanBooking(Myshipping.Application.RulesEngineOrderBookingMessageInfo)">
<member name="M:Myshipping.Application.IRulesEngineClientService.ExcuteRulesOceanBookingByMsg(Myshipping.Application.RulesEngineOrderBookingMessageInfo)">
<summary>
海运订舱请求规则引擎
海运订舱请求规则引擎校验
</summary>
<param name="model">海运订舱请求业务</param>
<returns>返回用户信息</returns>
</member>
<member name="M:Myshipping.Application.IRulesEngineClientService.ExcuteRulesOceanBooking(System.String)">
<summary>
海运订舱请求规则引擎校验
</summary>
<param name="bookingId">海运订舱主键</param>
<returns>返回用户信息</returns>
</member>
<member name="M:Myshipping.Application.IRulesEngineClientService.ExcuteRulesOceanBookingByModel(Myshipping.Application.BookingOrderDto)">
<summary>
海运订舱请求规则引擎校验
</summary>
<param name="model">海运订舱报文类</param>
<returns>返回回执</returns>
</member>
<member name="T:Myshipping.Application.RulesEngineClientService">
<summary>
请求规则平台
</summary>
</member>
<member name="M:Myshipping.Application.RulesEngineClientService.#ctor">
<member name="M:Myshipping.Application.RulesEngineClientService.#ctor(Myshipping.Core.SqlSugarRepository{Myshipping.Application.Entity.BookingOrder})">
<summary>
</summary>
</member>
<member name="M:Myshipping.Application.RulesEngineClientService.ExcuteRulesEngineOceanBooking(Myshipping.Application.RulesEngineOrderBookingMessageInfo)">
<member name="M:Myshipping.Application.RulesEngineClientService.ExcuteRulesOceanBookingByMsg(Myshipping.Application.RulesEngineOrderBookingMessageInfo)">
<summary>
海运订舱请求规则引擎
海运订舱请求规则引擎校验
</summary>
<param name="model">海运订舱请求业务</param>
<returns>返回用户信息</returns>
</member>
<member name="M:Myshipping.Application.RulesEngineClientService.ExcuteRulesOceanBooking(System.String)">
<summary>
海运订舱请求规则引擎校验
</summary>
<param name="bookingId">海运订舱主键</param>
<returns>返回用户信息</returns>
</member>
<member name="M:Myshipping.Application.RulesEngineClientService.ExcuteRulesOceanBookingByModel(Myshipping.Application.BookingOrderDto)">
<summary>
海运订舱请求规则引擎校验
</summary>
<param name="model">海运订舱报文类</param>
<returns>返回回执</returns>
</member>
<member name="M:Myshipping.Application.RulesEngineClientService.ExcuteRulesEngine(Myshipping.Application.RulesEngineOrderBookingMessageInfo)">
<summary>
请求规则平台

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

@ -55,12 +55,14 @@ namespace Myshipping.Application
private readonly SqlSugarRepository<BookingPrintTemplate> _repPrint;
private readonly ILogger<BookingOrderService> _logger;
private readonly ISysCacheService _cache;
private readonly SqlSugarRepository<BookingStatusLog> _statuslog;
private readonly SqlSugarRepository<BookingStatusLogDetail> _statuslogdetail;
public BookingOrderService(SqlSugarRepository<BookingOrder> rep, SqlSugarRepository<BookingCtn> repCtn, SqlSugarRepository<BookingCtnDetail> ctndetailrep,
SqlSugarRepository<BookingLog> bookinglog, SqlSugarRepository<BookingLogDetail> bookinglogdetail, SqlSugarRepository<BookingRemark> bookingremark,
SqlSugarRepository<BookingFile> bookingfile, SqlSugarRepository<DjyWebsiteAccountConfig> webconfig, SqlSugarRepository<BookingPrintTemplate> repPrint,
SqlSugarRepository<SysDictData> dicdata, ILogger<BookingOrderService> logger, ISysCacheService cache)
SqlSugarRepository<SysDictData> dicdata,SqlSugarRepository<BookingStatusLog> statuslog, SqlSugarRepository<BookingStatusLogDetail> statuslogdetail,
ILogger<BookingOrderService> logger, ISysCacheService cache)
{
this._logger = logger;
this._rep = rep;
@ -74,6 +76,8 @@ namespace Myshipping.Application
this._repPrint = repPrint;
this._dicdata = dicdata;
this._cache = cache;
this._statuslog = statuslog;
this._statuslogdetail = statuslogdetail;
}
/// <summary>
@ -261,7 +265,7 @@ namespace Myshipping.Application
if (!string.IsNullOrWhiteSpace(input.YARDID) && !string.IsNullOrWhiteSpace(input.YARD) && !string.IsNullOrWhiteSpace(input.MBLNO))
{
await SendTrace(input.YARDID, input.YARD, input.MBLNO);
await SendTrace(entity.Id.ToString(), entity.YARDID, entity.YARD, entity.MBLNO);
}
}
@ -367,7 +371,7 @@ namespace Myshipping.Application
{
if (!string.IsNullOrWhiteSpace(input.YARDID) && !string.IsNullOrWhiteSpace(input.YARD) && !string.IsNullOrWhiteSpace(input.MBLNO))
{
await SendTrace(input.YARDID, input.YARD, input.MBLNO);
await SendTrace(entity.Id.ToString(), entity.YARDID, entity.YARD, entity.MBLNO);
}
}
}
@ -519,11 +523,7 @@ namespace Myshipping.Application
/// <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)
public async Task SendTrace(string BusinessId, string YARDID, string YARD, string MBLNO)
{
_logger.LogInformation("提单号：" + MBLNO + " 调用运踪接口");
var key = _webconfig.FirstOrDefault(x => x.TenantId == Convert.ToInt64(UserManager.TENANT_ID) && x.TypeCode == "seae_billtraceurl");
@ -532,6 +532,7 @@ namespace Myshipping.Application
List<BillTraceList> billTraceList = new List<BillTraceList>();
billTraceList.Add(new BillTraceList
{
BusinessId = BusinessId,
MBLNO = MBLNO,
YARD = YARD,
YardCode = YARDID,
@ -542,9 +543,10 @@ namespace Myshipping.Application
billdto.Children = billTraceList;
billdto.Key = key.Account;
billdto.PWD = key.Password;
billdto.url = url.FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "response_seae_billtraceurl").Value;
billdto.Gid = UserManager.DjyUserId;
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>();
var html = await url.FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "request_seae_billtraceurl").Value.SetHttpMethod(HttpMethod.Post).SetQueries(new { msg = json }).SetRetryPolicy(3, 5000).SendAsAsync<RespCommon>();
_logger.LogInformation("提单号：" + MBLNO + " 调用运踪接口返回" + html.ToJsonString());
}
@ -650,5 +652,64 @@ namespace Myshipping.Application
// var rtn = XiahuozhiHelpler.Send(id, "9", out string msg);
// return $"{rtn} {msg}";
//}
/// <summary>
/// 获取货运动态
/// </summary>
public async Task<List<BookingStatusLogDto>> GetBookingStatusLog(long Id)
{
var statuslog = await _statuslog.AsQueryable().Where(x => x.BookingId == Id).ToListAsync();
var dto = statuslog.Adapt<List<BookingStatusLogDto>>();
foreach (var item in dto)
{
var detail = await _statuslogdetail.AsQueryable().Where(x => x.PId == item.Id).ToListAsync();
item.detail = detail.Adapt<List<BookingStatusLogDetailDto>>();
}
return dto;
}
/// <summary>
/// 插入货运动态
/// </summary>
[AllowAnonymous]
[SqlSugarUnitOfWork]
public async Task AddBookingStatusLog(List<BookingStatusLogDto> all)
{
foreach (var item in all)
{
//清空原有数据
var old = await _statuslog.AsQueryable().Where(x => x.BookingId == item.BookingId && x.Gategory == "ship").ToListAsync();
await _statuslog.DeleteAsync(x => x.BookingId == item.BookingId && x.Gategory == "ship");
foreach (var ot in old)
{
await _statuslogdetail.DeleteAsync(x => x.PId == ot.Id);
}
///新增数据
var bookingStatusLog = new BookingStatusLog();
bookingStatusLog.BookingId = item.BookingId;
bookingStatusLog.Gategory = "ship";
bookingStatusLog.CreatedTime = DateTime.Now;
bookingStatusLog.Status = item.Status;
bookingStatusLog.OpTiem = item.OpTiem;
bookingStatusLog.MBLNO = item.MBLNO;
var id = await _statuslog.InsertReturnSnowflakeIdAsync(bookingStatusLog);
if (item.detail != null && item.detail.Count > 0)
{
foreach (var dt in item.detail)
{
var BookingStatusLogDetail = new BookingStatusLogDetail();
BookingStatusLogDetail.PId = id;
BookingStatusLogDetail.Status = dt.Status;
BookingStatusLogDetail.CNTRNO = dt.CNTRNO;
BookingStatusLogDetail.OPTime = dt.OPTime;
await _statuslogdetail.InsertAsync(BookingStatusLogDetail);
}
}
}
}
}
}

67
Myshipping.Application/Service/BookingOrder/Dto/BookingStatusLogDto.cs
Unescape Escape View File

@ -0,0 +1,67 @@
using Myshipping.Application.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Application.Service.BookingOrder.Dto
{
public class BookingStatusLogDto
{
public long Id { get; set; }
/// <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; }
public List<BookingStatusLogDetailDto> detail { get; set; }
}
public class BookingStatusLogDetailDto
{
/// <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 DateTime? OPTime { get; set; }
}
}

9
Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs
Unescape Escape View File

@ -4,6 +4,7 @@ using System.Threading.Tasks;
using Myshipping.Application.Entity;
using Myshipping.Application.Service.BookingOrder.Dto;
using Microsoft.AspNetCore.Http;
using System.Collections.Generic;
namespace Myshipping.Application
{
@ -27,6 +28,12 @@ namespace Myshipping.Application
Task<BookingFile> GetFile(long Id);
Task SendTrace(string YARDID, string YARD, string MBLNO);
Task SendTrace(string BusinessId,string YARDID, string YARD, string MBLNO);
Task<List<BookingStatusLogDto>> GetBookingStatusLog(long Id);
Task AddBookingStatusLog(List<BookingStatusLogDto> all);
}
}

281
Myshipping.Application/Service/RulesEngine/Dtos/OceanBookingMapper.cs
Unescape Escape View File

@ -0,0 +1,281 @@
using Mapster;
using Myshipping.Application.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Application
{
public class OceanBookingMapper: IRegister
{
public void Register(TypeAdapterConfig config)
{
config.ForType<BookingOrder, RulesEngineOrderBookingMainBusinessInfo>()
.Map(dest => dest.MasterBlNo, src => src.MBLNO)
.Map(dest => dest.HouseBlNo, src => src.HBLNO)
.Map(dest => dest.BookingNo, src => src.BOOKINGNO)
.Map(dest => dest.ContrNo, src => src.CONTRACTNO)
.Map(dest => dest.ServContrNo, src => src.SERVICECONTRACTNO)
.Map(dest => dest.ShipperId, src => src.SHIPPERID)
.Map(dest => dest.ConsigneeId, src => src.CONSIGNEEID)
.Map(dest => dest.NotifyPartyId, src => src.NOTIFYPARTYID)
.Map(dest => dest.Shipper, src => src.SHIPPER)
.Map(dest => dest.Consignee, src => src.CONSIGNEE)
.Map(dest => dest.NotifyParty, src => src.NOTIFYPARTY)
.Map(dest => dest.NotifyPrt2, src => src.NOTIFYPARTY2)
.Map(dest => dest.YardId, src => src.YARDID)
.Map(dest => dest.Yard, src => src.YARD)
.Map(dest => dest.VesselId, src => src.VESSELID)
.Map(dest => dest.Vessel, src => src.VESSEL)
.Map(dest => dest.Voyno, src => src.VOYNO)
.Map(dest => dest.VoynoIn, src => src.VOYNOINNER)
.Map(dest => dest.ETD, src => src.ETD)
.Map(dest => dest.ATD, src => src.ATD)
.Map(dest => dest.ETA, src => src.ETA)
.Map(dest => dest.ClosingDate, src => src.CLOSINGDATE.HasValue ? src.CLOSINGDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.CloseDocDate, src => src.CLOSEDOCDATE.HasValue ? src.CLOSEDOCDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.CloseVGMDate, src => src.CLOSEVGMDATE.HasValue ? src.CLOSEVGMDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.PlaceReceiptId, src => src.PLACERECEIPTID)
.Map(dest => dest.PlaceReceipt, src => src.PLACERECEIPT)
.Map(dest => dest.PortLoadId, src => src.PORTLOAD)
.Map(dest => dest.PortLoad, src => src.PORTLOAD)
.Map(dest => dest.PortDischargeId, src => src.PORTDISCHARGEID)
.Map(dest => dest.PortDischarge, src => src.PORTDISCHARGE)
.Map(dest => dest.PlaceDeliveryId, src => src.PLACEDELIVERYID)
.Map(dest => dest.PlaceDelivery, src => src.PLACEDELIVERY)
.Map(dest => dest.DestinationId, src => src.DESTINATIONID)
.Map(dest => dest.Destination, src => src.DESTINATION)
.Map(dest => dest.NoBill, src => src.NOBILL)
.Map(dest => dest.CopyNoBill, src => src.COPYNOBILLL)
.Map(dest => dest.IssueType, src => src.ISSUETYPE)
.Map(dest => dest.IssueDate, src => src.ISSUEDATE.HasValue ? src.ISSUEDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.IssuePlaceId, src => src.ISSUEPLACEID)
.Map(dest => dest.IssuePlace, src => src.ISSUEPLACE)
.Map(dest => dest.Blfrt, src => src.BLFRT)
.Map(dest => dest.PrepardAt, src => src.PREPARDAT)
.Map(dest => dest.PayableAt, src => src.PAYABLEAT)
.Map(dest => dest.Service, src => src.SERVICE)
.Map(dest => dest.Marks, src => src.MARKS)
.Map(dest => dest.HsCode, src => src.HSCODE)
.Map(dest => dest.GoodsDescription, src => src.DESCRIPTION)
.Map(dest => dest.PKGs, src => src.PKGS)
.Map(dest => dest.KindPKGs, src => src.KINDPKGS)
.Map(dest => dest.KGs, src => src.KGS)
.Map(dest => dest.CBM, src => src.CBM)
.Map(dest => dest.TotalNO, src => src.TOTALNO)
.Map(dest => dest.CntrTotal, src => src.CNTRTOTAL)
.Map(dest => dest.CarrierId, src => src.CARRIERID)
.Map(dest => dest.Carrirer, src => src.CARRIER)
.Map(dest => dest.CargoId, src => src.CARGOID)
.Map(dest => dest.DClass, src => src.DCLASS)
.Map(dest => dest.DUnno, src => src.DUNNO)
.Map(dest => dest.DPage, src => src.DPAGE)
.Map(dest => dest.DLabel, src => src.DLABEL)
.Map(dest => dest.DLinkMan, src => src.LINKMAN)
.Map(dest => dest.TempId, src => src.TEMPID)
.Map(dest => dest.TempSet, src => src.TEMPSET)
.Map(dest => dest.Reeferf, src => src.REEFERF)
.Map(dest => dest.Humidity, src => src.HUMIDITY)
.Map(dest => dest.TempMin, src => src.TEMPMIN)
.Map(dest => dest.TempMax, src => src.TEMPMAX)
.Map(dest => dest.IsContaSOC, src => src.ISCONTAINERSOC)
.Map(dest => dest.SORemark, src => src.SOREMARK)
.Map(dest => dest.SIRemark, src => src.SIREMARK)
.Map(dest => dest.YardRemark, src => src.YARDREMARK)
.Map(dest => dest.ShipperName, src => src.SHIPPERNAME)
.Map(dest => dest.ShipperAddr1, src => src.SHIPPERADDR1)
.Map(dest => dest.ShipperAddr2, src => src.SHIPPERADDR2)
.Map(dest => dest.ShipperAddr3, src => src.SHIPPERADDR3)
.Map(dest => dest.ShipperCity, src => src.SHIPPERCITY)
.Map(dest => dest.ShipperProvice, src => src.SHIPPERPROVINCE)
.Map(dest => dest.ShipperPostCode, src => src.SHIPPERPOSTCODE)
.Map(dest => dest.ShipperCountry, src => src.SHIPPERCOUNTRY)
.Map(dest => dest.ShipperAttn, src => src.SHIPPERATTN)
.Map(dest => dest.ShipperTel, src => src.SHIPPERTEL)
.Map(dest => dest.ConsigneeName, src => src.CONSIGNEENAME)
.Map(dest => dest.ConsigneeAddr1, src => src.CONSIGNEEADDR1)
.Map(dest => dest.ConsigneeAddr2, src => src.CONSIGNEEADDR2)
.Map(dest => dest.ConsigneeAddr3, src => src.CONSIGNEEADDR3)
.Map(dest => dest.ConsigneeCity, src => src.CONSIGNEECITY)
.Map(dest => dest.ConsigneeProvince, src => src.CONSIGNEEPROVINCE)
.Map(dest => dest.ConsigneePostCode, src => src.CONSIGNEEPOSTCODE)
.Map(dest => dest.ConsigneeCountry, src => src.CONSIGNEERCOUNTRY)
.Map(dest => dest.ConsigneeAttn, src => src.CONSIGNEEATTN)
.Map(dest => dest.ConsigneeTel, src => src.CONSIGNEETEL)
.Map(dest => dest.NotifyPartyName, src => src.NOTIFYPARTYNAME)
.Map(dest => dest.NotifyPartyAddr1, src => src.NOTIFYPARTYADDR1)
.Map(dest => dest.NotifyPartyAddr2, src => src.NOTIFYPARTYADDR2)
.Map(dest => dest.NotifyPartyAddr3, src => src.NOTIFYPARTYADDR3)
.Map(dest => dest.NotifyPartyCity, src => src.NOTIFYPARTYCITY)
.Map(dest => dest.NotifyPartyProvince, src => src.NOTIFYPARTYPROVINCE)
.Map(dest => dest.NotifyPartyPostCode, src => src.NOTIFYPARTYPOSTCODE)
.Map(dest => dest.NotifyPartyCountry, src => src.NOTIFYPARTYCOUNTRY)
.Map(dest => dest.NotifyPartyAttn, src => src.NOTIFYPARTYATTN)
.Map(dest => dest.NotifyPartyTel, src => src.NOTIFYPARTYTEL)
.Map(dest => dest.CustomsER, src => src.CUSTOMSER)
.Map(dest => dest.TruckER, src => src.TRUCKER)
.Map(dest => dest.AgentId, src => src.AGENTID)
.Map(dest => dest.ForwarderId, src => src.FORWARDERID)
.Map(dest => dest.ShipAgencyId, src => src.SHIPAGENCYID)
.Map(dest => dest.CustomsERId, src => src.CUSTOMSERID)
.Map(dest => dest.TruckERId, src => src.TRUCKERID)
.Map(dest => dest.AgentName, src => src.AGENTNAME)
.Map(dest => dest.ConsigneeDoorAddr, src => src.CONSIGNEEDOORADDR)
.Map(dest => dest.ShipperDoorAddr, src => src.SHIPPERDOORADDR)
.Map(dest => dest.SCACCode, src => src.SCACCODE)
.Map(dest => dest.ITNCode, src => src.ITNCODE)
.Map(dest => dest.PrePardAtId, src => src.PREPARDATID)
.Map(dest => dest.PayableAtId, src => src.PAYABLEATID)
.Map(dest => dest.CustNo, src => src.CUSTNO)
.Map(dest => dest.TransportId, src => src.TRANSPORTID)
.Map(dest => dest.Transport, src => src.TRANSPORT)
.Map(dest => dest.ThirdPayAddr, src => src.THIRDPAYADDR)
.Map(dest => dest.YardContractTel, src => src.YARDCONTRACTTEL)
.Map(dest => dest.YardContractEmail, src => src.YARDCONTRACTEMAIL)
.Map(dest => dest.FeeSelf, src => src.FEESELF)
.Map(dest => dest.LaneCode, src => src.LANECODE)
.Map(dest => dest.LaneName, src => src.LANENAME)
.Map(dest => dest.FreightPayer, src => src.FREIGHTPAYER);
//.Map(dest => dest.ShipperTaxNo, src => src.tax)
//.Map(dest => dest.ConsigneeTaxNo, src => src.consig)
//.Map(dest => dest.NotifyPartyTaxNo, src => src.NotifyPartyTaxNo)
//.Map(dest => dest.IsATDChangeIssueType, src => src.IsATDChangeIssueType)
//.Map(dest => dest.IsEngChinaLineBar, src => src.IsEngChinaLineBar)
//.Map(dest => dest.IsDoubleShipper, src => src.IsDoubleShipper)
//.Map(dest => dest.IsFCLAndLCLMix, src => src.IsFCLAndLCLMix)
//.Map(dest => dest.IsMutipleGoods, src => src.IsMutipleGoods)
//.Map(dest => dest.IsContaLCL, src => src.IsContaLCL);
config.ForType<BookingOrderDto, RulesEngineOrderBookingMainBusinessInfo>()
.Map(dest => dest.MasterBlNo, src => src.MBLNO)
.Map(dest => dest.HouseBlNo, src => src.HBLNO)
.Map(dest => dest.BookingNo, src => src.BOOKINGNO)
.Map(dest => dest.ContrNo, src => src.CONTRACTNO)
.Map(dest => dest.ServContrNo, src => src.SERVICECONTRACTNO)
.Map(dest => dest.ShipperId, src => src.SHIPPERID)
.Map(dest => dest.ConsigneeId, src => src.CONSIGNEEID)
.Map(dest => dest.NotifyPartyId, src => src.NOTIFYPARTYID)
.Map(dest => dest.Shipper, src => src.SHIPPER)
.Map(dest => dest.Consignee, src => src.CONSIGNEE)
.Map(dest => dest.NotifyParty, src => src.NOTIFYPARTY)
.Map(dest => dest.NotifyPrt2, src => src.NOTIFYPARTY2)
.Map(dest => dest.YardId, src => src.YARDID)
.Map(dest => dest.Yard, src => src.YARD)
.Map(dest => dest.VesselId, src => src.VESSELID)
.Map(dest => dest.Vessel, src => src.VESSEL)
.Map(dest => dest.Voyno, src => src.VOYNO)
.Map(dest => dest.VoynoIn, src => src.VOYNOINNER)
.Map(dest => dest.ETD, src => src.ETD)
.Map(dest => dest.ATD, src => src.ATD)
.Map(dest => dest.ETA, src => src.ETA)
.Map(dest => dest.ClosingDate, src => src.CLOSINGDATE.HasValue ? src.CLOSINGDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.CloseDocDate, src => src.CLOSEDOCDATE.HasValue ? src.CLOSEDOCDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.CloseVGMDate, src => src.CLOSEVGMDATE.HasValue ? src.CLOSEVGMDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.PlaceReceiptId, src => src.PLACERECEIPTID)
.Map(dest => dest.PlaceReceipt, src => src.PLACERECEIPT)
.Map(dest => dest.PortLoadId, src => src.PORTLOAD)
.Map(dest => dest.PortLoad, src => src.PORTLOAD)
.Map(dest => dest.PortDischargeId, src => src.PORTDISCHARGEID)
.Map(dest => dest.PortDischarge, src => src.PORTDISCHARGE)
.Map(dest => dest.PlaceDeliveryId, src => src.PLACEDELIVERYID)
.Map(dest => dest.PlaceDelivery, src => src.PLACEDELIVERY)
.Map(dest => dest.DestinationId, src => src.DESTINATIONID)
.Map(dest => dest.Destination, src => src.DESTINATION)
.Map(dest => dest.NoBill, src => src.NOBILL)
.Map(dest => dest.CopyNoBill, src => src.COPYNOBILLL)
.Map(dest => dest.IssueType, src => src.ISSUETYPE)
.Map(dest => dest.IssueDate, src => src.ISSUEDATE.HasValue ? src.ISSUEDATE.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.IssuePlaceId, src => src.ISSUEPLACEID)
.Map(dest => dest.IssuePlace, src => src.ISSUEPLACE)
.Map(dest => dest.Blfrt, src => src.BLFRT)
.Map(dest => dest.PrepardAt, src => src.PREPARDAT)
.Map(dest => dest.PayableAt, src => src.PAYABLEAT)
.Map(dest => dest.Service, src => src.SERVICE)
.Map(dest => dest.Marks, src => src.MARKS)
.Map(dest => dest.HsCode, src => src.HSCODE)
.Map(dest => dest.GoodsDescription, src => src.DESCRIPTION)
.Map(dest => dest.PKGs, src => src.PKGS)
.Map(dest => dest.KindPKGs, src => src.KINDPKGS)
.Map(dest => dest.KGs, src => src.KGS)
.Map(dest => dest.CBM, src => src.CBM)
.Map(dest => dest.TotalNO, src => src.TOTALNO)
.Map(dest => dest.CntrTotal, src => src.CNTRTOTAL)
.Map(dest => dest.CarrierId, src => src.CARRIERID)
.Map(dest => dest.Carrirer, src => src.CARRIER)
.Map(dest => dest.CargoId, src => src.CARGOID)
.Map(dest => dest.DClass, src => src.DCLASS)
.Map(dest => dest.DUnno, src => src.DUNNO)
.Map(dest => dest.DPage, src => src.DPAGE)
.Map(dest => dest.DLabel, src => src.DLABEL)
.Map(dest => dest.DLinkMan, src => src.LINKMAN)
.Map(dest => dest.TempId, src => src.TEMPID)
.Map(dest => dest.TempSet, src => src.TEMPSET)
.Map(dest => dest.Reeferf, src => src.REEFERF)
.Map(dest => dest.Humidity, src => src.HUMIDITY)
.Map(dest => dest.TempMin, src => src.TEMPMIN)
.Map(dest => dest.TempMax, src => src.TEMPMAX)
.Map(dest => dest.IsContaSOC, src => src.ISCONTAINERSOC)
.Map(dest => dest.SORemark, src => src.SOREMARK)
.Map(dest => dest.SIRemark, src => src.SIREMARK)
.Map(dest => dest.YardRemark, src => src.YARDREMARK)
.Map(dest => dest.ShipperName, src => src.SHIPPERNAME)
.Map(dest => dest.ShipperAddr1, src => src.SHIPPERADDR1)
.Map(dest => dest.ShipperAddr2, src => src.SHIPPERADDR2)
.Map(dest => dest.ShipperAddr3, src => src.SHIPPERADDR3)
.Map(dest => dest.ShipperCity, src => src.SHIPPERCITY)
.Map(dest => dest.ShipperProvice, src => src.SHIPPERPROVINCE)
.Map(dest => dest.ShipperPostCode, src => src.SHIPPERPOSTCODE)
.Map(dest => dest.ShipperCountry, src => src.SHIPPERCOUNTRY)
.Map(dest => dest.ShipperAttn, src => src.SHIPPERATTN)
.Map(dest => dest.ShipperTel, src => src.SHIPPERTEL)
.Map(dest => dest.ConsigneeName, src => src.CONSIGNEENAME)
.Map(dest => dest.ConsigneeAddr1, src => src.CONSIGNEEADDR1)
.Map(dest => dest.ConsigneeAddr2, src => src.CONSIGNEEADDR2)
.Map(dest => dest.ConsigneeAddr3, src => src.CONSIGNEEADDR3)
.Map(dest => dest.ConsigneeCity, src => src.CONSIGNEECITY)
.Map(dest => dest.ConsigneeProvince, src => src.CONSIGNEEPROVINCE)
.Map(dest => dest.ConsigneePostCode, src => src.CONSIGNEEPOSTCODE)
.Map(dest => dest.ConsigneeCountry, src => src.CONSIGNEERCOUNTRY)
.Map(dest => dest.ConsigneeAttn, src => src.CONSIGNEEATTN)
.Map(dest => dest.ConsigneeTel, src => src.CONSIGNEETEL)
.Map(dest => dest.NotifyPartyName, src => src.NOTIFYPARTYNAME)
.Map(dest => dest.NotifyPartyAddr1, src => src.NOTIFYPARTYADDR1)
.Map(dest => dest.NotifyPartyAddr2, src => src.NOTIFYPARTYADDR2)
.Map(dest => dest.NotifyPartyAddr3, src => src.NOTIFYPARTYADDR3)
.Map(dest => dest.NotifyPartyCity, src => src.NOTIFYPARTYCITY)
.Map(dest => dest.NotifyPartyProvince, src => src.NOTIFYPARTYPROVINCE)
.Map(dest => dest.NotifyPartyPostCode, src => src.NOTIFYPARTYPOSTCODE)
.Map(dest => dest.NotifyPartyCountry, src => src.NOTIFYPARTYCOUNTRY)
.Map(dest => dest.NotifyPartyAttn, src => src.NOTIFYPARTYATTN)
.Map(dest => dest.NotifyPartyTel, src => src.NOTIFYPARTYTEL)
.Map(dest => dest.CustomsER, src => src.CUSTOMSER)
.Map(dest => dest.TruckER, src => src.TRUCKER)
.Map(dest => dest.AgentId, src => src.AGENTID)
.Map(dest => dest.ForwarderId, src => src.FORWARDERID)
.Map(dest => dest.ShipAgencyId, src => src.SHIPAGENCYID)
.Map(dest => dest.CustomsERId, src => src.CUSTOMSERID)
.Map(dest => dest.TruckERId, src => src.TRUCKERID)
.Map(dest => dest.AgentName, src => src.AGENTNAME)
.Map(dest => dest.ConsigneeDoorAddr, src => src.CONSIGNEEDOORADDR)
.Map(dest => dest.ShipperDoorAddr, src => src.SHIPPERDOORADDR)
.Map(dest => dest.SCACCode, src => src.SCACCODE)
.Map(dest => dest.ITNCode, src => src.ITNCODE)
.Map(dest => dest.PrePardAtId, src => src.PREPARDATID)
.Map(dest => dest.PayableAtId, src => src.PAYABLEATID)
.Map(dest => dest.CustNo, src => src.CUSTNO)
.Map(dest => dest.TransportId, src => src.TRANSPORTID)
.Map(dest => dest.Transport, src => src.TRANSPORT)
.Map(dest => dest.ThirdPayAddr, src => src.THIRDPAYADDR)
.Map(dest => dest.YardContractTel, src => src.YARDCONTRACTTEL)
.Map(dest => dest.YardContractEmail, src => src.YARDCONTRACTEMAIL)
.Map(dest => dest.FeeSelf, src => src.FEESELF)
.Map(dest => dest.LaneCode, src => src.LANECODE)
.Map(dest => dest.LaneName, src => src.LANENAME)
.Map(dest => dest.FreightPayer, src => src.FREIGHTPAYER);
}
}
}

1
Myshipping.Application/Service/RulesEngine/Dtos/OrderBooking/RulesEngineWebApiResult.cs
Unescape Escape View File

@ -12,6 +12,7 @@ namespace Myshipping.Application
/// 是否成功 true=成功 false=失败
/// </summary>
public bool succ { get; set; } = false;
/// <summary>
/// 状态 0-成功
/// </summary>

44
Myshipping.Application/Service/RulesEngine/Dtos/RulesEngineExcuteResultDetailDto.cs
Unescape Escape View File

@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Application
{
/// <summary>
/// 规则执行结果明细
/// </summary>
public class RulesEngineExcuteResultDetailDto
{
/// <summary>
/// 当前规则是否校验成功 true-成功 false-失败
/// </summary>
public bool IsSuccess { get; set; }
/// <summary>
/// 返回代码
/// </summary>
public string ResultCode { get; set; }
/// <summary>
/// 返回名称
/// </summary>
public string ResultName { get; set; }
/// <summary>
/// 规则提醒类型 Error-错误 Warning-提醒
/// </summary>
public string ErrorType { get; set; }
/// <summary>
/// 规则名称
/// </summary>
public string RuleName { get; set; }
/// <summary>
/// 规则集名称
/// </summary>
public string WFName { get; set; }
}
}

34
Myshipping.Application/Service/RulesEngine/Dtos/RulesEngineExcuteResultDto.cs
Unescape Escape View File

@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Application
{
/// <summary>
/// 规则执行结果
/// </summary>
public class RulesEngineExcuteResultDto
{
/// <summary>
/// 是否成功 true=成功 false=失败
/// </summary>
public bool succ { get; set; } = false;
/// <summary>
/// 状态 0-成功
/// </summary>
public int status { get; set; } = 0;
/// <summary>
/// 返回消息
/// </summary>
public string msg { get; set; }
/// <summary>
/// 返回校验明细
/// </summary>
public List<RulesEngineExcuteResultDetailDto> rows { get; set; }
}
}

24
Myshipping.Application/Service/RulesEngine/Interface/IRulesEngineClientService.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using System;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -9,10 +10,27 @@ namespace Myshipping.Application
public interface IRulesEngineClientService
{
/// <summary>
/// 海运订舱请求规则引擎
/// 海运订舱请求规则引擎校验
/// </summary>
/// <param name="model">海运订舱请求业务</param>
/// <returns>返回用户信息</returns>
Task<RulesEngineWebApiResult> ExcuteRulesEngineOceanBooking(RulesEngineOrderBookingMessageInfo model);
Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBookingByMsg(RulesEngineOrderBookingMessageInfo model);
/// <summary>
/// 海运订舱请求规则引擎校验
/// </summary>
/// <param name="bookingId">海运订舱主键</param>
/// <returns>返回用户信息</returns>
Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBooking(string bookingId);
/// <summary>
/// 海运订舱请求规则引擎校验
/// </summary>
/// <param name="model">海运订舱报文类</param>
/// <returns>返回回执</returns>
Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBookingByModel(BookingOrderDto model);
}
}

187
Myshipping.Application/Service/RulesEngine/RulesEngineClientService.cs
Unescape Escape View File

@ -13,6 +13,10 @@ using Microsoft.AspNetCore.Mvc;
using System.Xml.Linq;
using Furion.DynamicApiController;
using Microsoft.AspNetCore.Authorization;
using Myshipping.Application.Entity;
using Myshipping.Core;
using Furion.DistributedIDGenerator;
using Mapster;
namespace Myshipping.Application
{
@ -21,26 +25,195 @@ namespace Myshipping.Application
/// </summary>
public class RulesEngineClientService: IRulesEngineClientService, IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<BookingOrder> _bookingOrderRepository;
/// <summary>
///
/// </summary>
public RulesEngineClientService()
public RulesEngineClientService(SqlSugarRepository<BookingOrder> bookingOrderRepository)
{
_bookingOrderRepository = bookingOrderRepository;
}
/// <summary>
/// 海运订舱请求规则引擎
/// 海运订舱请求规则引擎校验
/// </summary>
/// <param name="model">海运订舱请求业务</param>
/// <returns>返回用户信息</returns>
[AllowAnonymous]
[ApiDescriptionSettings("Application", Name = "ExcuteRulesEngineOceanBooking", Order = 1)]
public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBookingByMsg(RulesEngineOrderBookingMessageInfo model)
{
RulesEngineExcuteResultDto result = new RulesEngineExcuteResultDto();
var ruleResult = await ExcuteRulesEngine(model);
if (ruleResult == null)
throw Oops.Oh($"订舱请求规则失败，返回为空");
var ruleDetailList = ruleResult.rows as List<RulesEngineExcuteResultDetailDto>;
result.succ = ruleResult.succ;
result.msg = ruleResult.msg;
if (ruleDetailList.Count > 0)
{
result.rows = ruleDetailList;
}
return result;
}
/// <summary>
/// 海运订舱请求规则引擎校验
/// </summary>
/// <param name="bookingId">海运订舱主键</param>
/// <returns>返回用户信息</returns>
[HttpGet]
public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBooking(string bookingId)
{
/*
处理逻辑
1、订单保存后触发调取此方法，传入海运订舱主键。
2、调取订舱的详情。
3、对应请求报文。
4、请求规则接口。
5、返回回执。
*/
RulesEngineExcuteResultDto result = new RulesEngineExcuteResultDto();
try
{
DateTime nowDate = DateTime.Now;
var model = _bookingOrderRepository.AsQueryable().InSingle(bookingId);
if (model == null)
throw Oops.Oh($"订舱主键{bookingId}无法获取业务信息");
RulesEngineOrderBookingMessageInfo msgModel = new RulesEngineOrderBookingMessageInfo();
msgModel.Head = new RulesEngineWebAPIHeadBase
{
GID = IDGen.NextID().ToString(),
MessageType = "BUSI_RULE",
SenderId = App.Configuration["RulesEngineSender"],
SenderName = App.Configuration["RulesEngineSenderName"],
SenderKey = App.Configuration["RulesEngineAuthKey"],
ReceiverId = "RulesEngine",
ReceiverName = "大简云规则引擎",
Version = "1.0",
RequestDate = nowDate.ToString("yyyy-MM-dd HH:mm:ss"),
RequestAction = "CheckRule",
};
msgModel.Main = new RulesEngineOrderBookingMainInfo {
ProjectCode = App.Configuration["RulesEngineProjects"].Split(new char[] { ','}).ToArray(),
};
msgModel.Main.BusinessInfo = model.Adapt<RulesEngineOrderBookingMainBusinessInfo>();
var ruleResult = await ExcuteRulesEngine(msgModel);
if(ruleResult == null)
throw Oops.Oh($"订舱主键{bookingId}请求规则失败，返回为空");
var ruleDetailList = ruleResult.rows as List<RulesEngineExcuteResultDetailDto>;
result.succ = ruleResult.succ;
result.msg = ruleResult.msg;
if (ruleDetailList.Count > 0)
{
result.rows = ruleDetailList;
}
}
catch(Exception ex)
{
result.succ = false;
result.msg = "请求规则异常";
}
return result;
}
/// <summary>
/// 海运订舱请求规则引擎校验
/// </summary>
/// <param name="model">海运订舱报文类</param>
/// <returns>返回回执</returns>
[HttpPost]
public async Task<RulesEngineExcuteResultDto> ExcuteRulesOceanBookingByModel(BookingOrderDto model)
{
/*
处理逻辑
1、前台将保存报文推送过来。
2、如果有订舱主键调取数据库内的订舱的详情，已推送的数据为准。
3、对应请求报文。
4、请求规则接口。
5、返回回执。
*/
RulesEngineExcuteResultDto result = new RulesEngineExcuteResultDto();
public async Task<RulesEngineWebApiResult> ExcuteRulesEngineOceanBooking(RulesEngineOrderBookingMessageInfo model)
try
{
return await ExcuteRulesEngine(model);
DateTime nowDate = DateTime.Now;
//var model =
//if()
// _bookingOrderRepository.AsQueryable().InSingle(bookingId);
//if (model == null)
// throw Oops.Oh($"订舱主键{bookingId}无法获取业务信息");
RulesEngineOrderBookingMessageInfo msgModel = new RulesEngineOrderBookingMessageInfo();
msgModel.Head = new RulesEngineWebAPIHeadBase
{
GID = IDGen.NextID().ToString(),
MessageType = "BUSI_RULE",
SenderId = App.Configuration["RulesEngineSender"],
SenderName = App.Configuration["RulesEngineSenderName"],
SenderKey = App.Configuration["RulesEngineAuthKey"],
ReceiverId = "RulesEngine",
ReceiverName = "大简云规则引擎",
Version = "1.0",
RequestDate = nowDate.ToString("yyyy-MM-dd HH:mm:ss"),
RequestAction = "CheckRule",
};
msgModel.Main = new RulesEngineOrderBookingMainInfo
{
ProjectCode = App.Configuration["RulesEngineProjects"].Split(new char[] { ',' }).ToArray(),
};
msgModel.Main.BusinessInfo = model.Adapt<RulesEngineOrderBookingMainBusinessInfo>();
var ruleResult = await ExcuteRulesEngine(msgModel);
if (ruleResult == null)
throw Oops.Oh($"订舱主键{model.BOOKINGNO}请求规则失败，返回为空");
var ruleDetailList = ruleResult.rows as List<RulesEngineExcuteResultDetailDto>;
result.succ = ruleResult.succ;
result.msg = ruleResult.msg;
if (ruleDetailList.Count > 0)
{
result.rows = ruleDetailList;
}
}
catch (Exception ex)
{
result.succ = false;
result.msg = "请求规则异常";
}
return result;
}
/// <summary>

5
Myshipping.Core/Const/ClaimConst.cs
Unescape Escape View File

@ -35,4 +35,9 @@ public class ClaimConst
/// 租户名称
/// </summary>
public const string CLAINM_TENANT_NAME = "TenantName";
/// <summary>
/// 大简云userid
/// </summary>
public const string DjyUserId = "DjyUserId";
}

6
Myshipping.Core/Entity/SysUser.cs
Unescape Escape View File

@ -88,4 +88,10 @@ public class SysUser : DBEntityTenant
/// 状态-正常_0、停用_1、删除_2
/// </summary>
public CommonStatus Status { get; set; } = CommonStatus.ENABLE;
/// <summary>
/// 大简云userid
/// </summary>
[MaxLength(20)]
public string DjyUserId { get; set; }
}

5
Myshipping.Core/Manager/UserManager.cs
Unescape Escape View File

@ -41,4 +41,9 @@ public static class UserManager
/// 租户名称
/// </summary>
public static string CLAINM_TENANT_NAME => App.User.FindFirst(ClaimConst.CLAINM_TENANT_NAME)?.Value;
/// <summary>
/// 大简云userid
/// </summary>
public static string DjyUserId => App.User.FindFirst(ClaimConst.DjyUserId)?.Value;
}

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

@ -537,6 +537,11 @@
租户名称
</summary>
</member>
<member name="F:Myshipping.Core.ClaimConst.DjyUserId">
<summary>
大简云userid
</summary>
</member>
<member name="F:Myshipping.Core.CommonConst.CACHE_KEY_USER">
<summary>
用户缓存
@ -3255,6 +3260,11 @@
状态-正常_0、停用_1、删除_2
</summary>
</member>
<member name="P:Myshipping.Core.Entity.SysUser.DjyUserId">
<summary>
大简云userid
</summary>
</member>
<member name="T:Myshipping.Core.Entity.SysUserDataScope">
<summary>
用户数据范围表
@ -4865,6 +4875,11 @@
租户名称
</summary>
</member>
<member name="P:Myshipping.Core.UserManager.DjyUserId">
<summary>
大简云userid
</summary>
</member>
<member name="T:Myshipping.Core.TokenModel">
<summary>
AccessToken参数

2
Myshipping.Core/Service/Cache/SysCacheService.cs
Unescape Escape View File

@ -15,7 +15,7 @@ namespace Myshipping.Core.Service;
/// <summary>
/// 系统缓存服务
/// </summary>
[ApiDescriptionSettings(Name = "Cache", Order = 100),AllowAnonymous]
[ApiDescriptionSettings(Name = "Cache", Order = 100)]
public class SysCacheService : ISysCacheService, IDynamicApiController, ISingleton
{

1
Myshipping.Web.Core/applicationconfig.json
Unescape Escape View File

@ -109,5 +109,6 @@
"RulesEngineUrl": "http://192.168.0.181:8088/api/RulesEngineManage/ExcuteWorkFlow",
"RulesEngineAuthKey": "clova3dXNnBldkM4bzVyUkxNcjVIS0lhUTNja2xmRVI4SDZDMkIzRURBMitKamJPb0tIRkMxemF5VlZOQ0wxUDdNeGNuTzF1NnEyOS9FS1VpeDBDZWFya0VucFR4ZE1Ca1JaUXZVb3lhdGs9",
"RulesEngineSender": "NewOceanBooking",
"RulesEngineSenderName": "新海运订舱平台",
"RulesEngineProjects": "OCEAN_BOOKING"
}
Write Preview
Loading…
Cancel
Save