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

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

Browse Source 
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
booking_auth_dev
wanghaomei 2 years ago
parent dd591ab790 89f3875f62
commit af71d511bb
8 changed files with 84 additions and 114 deletions
Show Stats Download Patch File Download Diff File

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

@ -256,28 +256,7 @@ namespace Myshipping.Application
if (!string.IsNullOrWhiteSpace(input.YARDID) && !string.IsNullOrWhiteSpace(input.YARD) && !string.IsNullOrWhiteSpace(input.MBLNO))
{
_logger.LogInformation("提单号：" + input.MBLNO + " 调用运踪接口");
var key = _webconfig.FirstOrDefault(x => x.TenantId == Convert.ToInt64(UserManager.TENANT_ID) && x.TypeCode == "seae_billtraceurl");
var url = _cache.GetAllDictData().Result;
BillTraceDto billdto = new BillTraceDto();
List<BillTraceList> billTraceList = new List<BillTraceList>();
billTraceList.Add(new BillTraceList
{
MBLNO = input.MBLNO,
YARD = input.YARD,
YardCode = input.YARDID,
CARRIER = null,
CARRIERID = null,
isBook = false
});
billdto.Children = billTraceList;
billdto.Key = key.Account;
billdto.PWD = key.Password;
var json = billdto.ToJsonString();
var html = await url.FirstOrDefault(x=>x.TypeCode== "url_set"&&x.Code== "seae_billtraceurl").Value.SetHttpMethod(HttpMethod.Post).SetQueries(new { msg = json }).SetRetryPolicy(3, 5000).SendAsAsync<RespCommon>();
_logger.LogInformation("提单号：" + input.MBLNO + " 调用运踪接口返回" + html.ToJsonString());
await SendTrace(input.YARDID, input.YARD, input.MBLNO);
}
}
@ -381,29 +360,9 @@ namespace Myshipping.Application
});
if (descriptor.Name == "YARDID" || descriptor.Name == "YARD" || descriptor.Name == "MBLNO")
{
if (!string.IsNullOrWhiteSpace(input.YARDID) && !string.IsNullOrWhiteSpace(input.YARD) && !string.IsNullOrWhiteSpace(input.MBLNO))
{
_logger.LogInformation("提单号：" + input.MBLNO + " 调用运踪接口");
var key = _webconfig.FirstOrDefault(x => x.TenantId == Convert.ToInt64(UserManager.TENANT_ID) && x.TypeCode == "seae_billtraceurl");
var url = _cache.GetAllDictData().Result;
BillTraceDto billdto = new BillTraceDto();
List<BillTraceList> billTraceList = new List<BillTraceList>();
billTraceList.Add(new BillTraceList
{
MBLNO = input.MBLNO,
YARD = input.YARD,
YardCode = input.YARDID,
CARRIER = null,
CARRIERID = null,
isBook = false
});
billdto.Children = billTraceList;
billdto.Key = key.Account;
billdto.PWD = key.Password;
var json = billdto.ToJsonString();
var html = await url.FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "seae_billtraceurl").Value.SetHttpMethod(HttpMethod.Post).SetQueries(new { msg = json }).SetRetryPolicy(3, 5000).SendAsAsync<RespCommon>();
_logger.LogInformation("提单号：" + input.MBLNO + " 调用运踪接口返回" + html.ToJsonString());
await SendTrace(input.YARDID, input.YARD, input.MBLNO);
}
}
}
@ -554,11 +513,28 @@ namespace Myshipping.Application
[HttpGet("/BookingPrintTemplate/test")]
public async Task<string> Test(long id)
public async Task SendTrace(string YARDID, string YARD, string MBLNO)
{
var rtn = XiahuozhiHelpler.Send(id, "9", out string msg);
return $"{rtn} {msg}";
_logger.LogInformation("提单号：" + MBLNO + " 调用运踪接口");
var key = _webconfig.FirstOrDefault(x => x.TenantId == Convert.ToInt64(UserManager.TENANT_ID) && x.TypeCode == "seae_billtraceurl");
var url = _cache.GetAllDictData().Result;
BillTraceDto billdto = new BillTraceDto();
List<BillTraceList> billTraceList = new List<BillTraceList>();
billTraceList.Add(new BillTraceList
{
MBLNO = MBLNO,
YARD = YARD,
YardCode = YARDID,
CARRIER = null,
CARRIERID = null,
isBook = false
});
billdto.Children = billTraceList;
billdto.Key = key.Account;
billdto.PWD = key.Password;
var json = billdto.ToJsonString();
var html = await url.FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "seae_billtraceurl").Value.SetHttpMethod(HttpMethod.Post).SetQueries(new { msg = json }).SetRetryPolicy(3, 5000).SendAsAsync<RespCommon>();
_logger.LogInformation("提单号：" + MBLNO + " 调用运踪接口返回" + html.ToJsonString());
}
}
}

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

@ -26,5 +26,7 @@ namespace Myshipping.Application
Task AddFile(IFormFile file, [FromForm] BookingFileDto dto);
Task<BookingFile> GetFile(long Id);
Task SendTrace(string YARDID, string YARD, string MBLNO);
}
}

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

@ -6958,6 +6958,13 @@
<param name="code"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.SysDictDataService.CacheData">
<summary>
缓存数据
</summary>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="T:Myshipping.Core.Service.SysDictTypeService">
<summary>
字典类型服务

2
Myshipping.Core/Service/Dict/ISysDictDataService.cs
Unescape Escape View File

@ -17,4 +17,6 @@ public interface ISysDictDataService
Task<dynamic> QueryDictDataPageList([FromQuery] DictDataInput input);
Task UpdateDictData(UpdateDictDataInput input);
Task<List<SysDictData>> GetDictDataByCode(string code);
Task CacheData();
}

92
Myshipping.Core/Service/Dict/SysDictDataService.cs
Unescape Escape View File

@ -79,19 +79,7 @@ public class SysDictDataService : ISysDictDataService, IDynamicApiController, IT
await _sysDictDataRep.InsertAsync(dictData);
////设置缓存
await _cache.DelAsync(CommonConst.CACHE_KEY_COMMON_DB_DICT_DATA);
var list = await _sysDictDataRep.AsQueryable().InnerJoin<SysDictType>((d, t) => d.TypeId == t.Id).Where((d, t) => t.Status == CommonStatus.ENABLE && d.Status == CommonStatus.ENABLE).Select((d, t) => new DictDataDto
{
Id = d.Id,
TypeName = t.Name,
TypeCode = t.Code,
Value = d.Value,
Code = d.Code,
Sort = d.Sort,
Remark = d.Remark
}).ToListAsync();
await _cache.SetAllDictData(list);
await CacheData();
}
@ -110,19 +98,7 @@ public class SysDictDataService : ISysDictDataService, IDynamicApiController, IT
await _sysDictDataRep.DeleteAsync(dictData);
////设置缓存
await _cache.DelAsync(CommonConst.CACHE_KEY_COMMON_DB_DICT_DATA);
var list = await _sysDictDataRep.AsQueryable().InnerJoin<SysDictType>((d, t) => d.TypeId == t.Id).Where((d, t) => t.Status == CommonStatus.ENABLE && d.Status == CommonStatus.ENABLE).Select((d, t) => new DictDataDto
{
Id = d.Id,
TypeName = t.Name,
TypeCode = t.Code,
Value = d.Value,
Code = d.Code,
Sort = d.Sort,
Remark = d.Remark
}).ToListAsync();
await _cache.SetAllDictData(list);
await CacheData();
}
/// <summary>
@ -144,19 +120,7 @@ public class SysDictDataService : ISysDictDataService, IDynamicApiController, IT
await _sysDictDataRep.AsUpdateable(dictData).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
////设置缓存
await _cache.DelAsync(CommonConst.CACHE_KEY_COMMON_DB_DICT_DATA);
var list = await _sysDictDataRep.AsQueryable().InnerJoin<SysDictType>((d, t) => d.TypeId == t.Id).Where((d, t) => t.Status == CommonStatus.ENABLE && d.Status == CommonStatus.ENABLE).Select((d, t) => new DictDataDto
{
Id = d.Id,
TypeName = t.Name,
TypeCode = t.Code,
Value = d.Value,
Code = d.Code,
Sort = d.Sort,
Remark = d.Remark
}).ToListAsync();
await _cache.SetAllDictData(list);
await CacheData();
}
/// <summary>
@ -185,19 +149,7 @@ public class SysDictDataService : ISysDictDataService, IDynamicApiController, IT
throw Oops.Oh(ErrorCode.D3005);
dictData.Status = input.Status;
////设置缓存
await _cache.DelAsync(CommonConst.CACHE_KEY_COMMON_DB_DICT_DATA);
var list = await _sysDictDataRep.AsQueryable().InnerJoin<SysDictType>((d, t) => d.TypeId == t.Id).Where((d, t) => t.Status == CommonStatus.ENABLE && d.Status == CommonStatus.ENABLE).Select((d, t) => new DictDataDto
{
Id = d.Id,
TypeName = t.Name,
TypeCode = t.Code,
Value = d.Value,
Code = d.Code,
Sort = d.Sort,
Remark = d.Remark
}).ToListAsync();
await _cache.SetAllDictData(list);
await CacheData();
}
/// <summary>
@ -226,8 +178,29 @@ public class SysDictDataService : ISysDictDataService, IDynamicApiController, IT
{
await _sysDictDataRep.DeleteAsync(u => u.TypeId == dictTypeId);
////设置缓存
await _cache.DelAsync(CommonConst.CACHE_KEY_COMMON_DB_DICT_DATA);
await CacheData();
}
/// <summary>
/// 根据字典Code返回字典值列表
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
[NonAction]
public async Task<List<SysDictData>> GetDictDataByCode(string code)
{
var payment = await _sysDictDataRep.AsQueryable().InnerJoin<SysDictType>((d, t) => d.TypeId == t.Id).Where((d, t) => t.Code == code).Select<SysDictData>().ToListAsync();
return payment;
}
/// <summary>
/// 缓存数据
/// </summary>
/// <returns></returns>
/// <exception cref="System.NotImplementedException"></exception>
[NonAction]
public async Task CacheData()
{
var list = await _sysDictDataRep.AsQueryable().InnerJoin<SysDictType>((d, t) => d.TypeId == t.Id).Where((d, t) => t.Status == CommonStatus.ENABLE && d.Status == CommonStatus.ENABLE).Select((d, t) => new DictDataDto
{
Id = d.Id,
@ -242,15 +215,4 @@ public class SysDictDataService : ISysDictDataService, IDynamicApiController, IT
}
/// <summary>
/// 根据字典Code返回字典值列表
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
[NonAction]
public async Task<List<SysDictData>> GetDictDataByCode(string code)
{
var payment = await _sysDictDataRep.AsQueryable().InnerJoin<SysDictType>((d, t) => d.TypeId == t.Id).Where((d, t) => t.Code == code).Select<SysDictData>().ToListAsync();
return payment;
}
}

17
Myshipping.Core/Service/DjyTenantParam/DjyTenantParamService.cs
Unescape Escape View File

@ -22,13 +22,14 @@ namespace Myshipping.Core.Service
private readonly SqlSugarRepository<DjyTenantParamItem> _itemrep;
private readonly SqlSugarRepository<DjyTenantParamValue> _valuerep;
private readonly ILogger<DjyTenantParam> _logger;
public DjyTenantParamService(SqlSugarRepository<DjyTenantParam> rep, SqlSugarRepository<DjyTenantParamItem> itemrep, SqlSugarRepository<DjyTenantParamValue> valuerep, ILogger<DjyTenantParam> logger)
private readonly ISysCacheService _cache;
public DjyTenantParamService(SqlSugarRepository<DjyTenantParam> rep, SqlSugarRepository<DjyTenantParamItem> itemrep, SqlSugarRepository<DjyTenantParamValue> valuerep, ISysCacheService cache, ILogger<DjyTenantParam> logger)
{
_rep = rep;
_logger = logger;
_itemrep = itemrep;
_valuerep = valuerep;
_cache = cache;
}
@ -112,6 +113,7 @@ namespace Myshipping.Core.Service
{
var entity = input.Adapt<DjyTenantParamItem>();
await _itemrep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
/// <summary>
@ -126,6 +128,7 @@ namespace Myshipping.Core.Service
await _valuerep.DeleteAsync(m => m.ItemCode == entity.ItemCode && m.ParaCode == entity.ParaCode);
await _itemrep.DeleteAsync(entity);
}
@ -151,6 +154,7 @@ namespace Myshipping.Core.Service
{
var entity = input.Adapt<DjyTenantParamValue>();
await _valuerep.InsertAsync(entity);
await CacheData();
}
@ -163,6 +167,7 @@ namespace Myshipping.Core.Service
{
var entity = input.Adapt<DjyTenantParamValue>();
await _valuerep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
await CacheData();
}
/// <summary>
@ -176,5 +181,13 @@ namespace Myshipping.Core.Service
var entity = await _itemrep.FirstOrDefaultAsync(u => u.Id == Id);
await _valuerep.DeleteAsync(entity);
}
public async Task CacheData()
{
var list = await _valuerep.AsQueryable().ToListAsync();
await _cache.SetAllTenantParam(list);
}
}
}

2
Myshipping.Core/Service/DjyTenantParam/IDjyTenantParamService.cs
Unescape Escape View File

@ -17,5 +17,7 @@ namespace Myshipping.Core.Service
Task UpdateParamItem(DjyTenantParamItem input);
Task DeleteParamItem(long Id);
Task CacheData();
}
}

6
Myshipping.Web.Core/Startup.cs
Unescape Escape View File

@ -113,6 +113,12 @@ public class Startup : AppStartup
//缓存EDI数据
App.GetService<IDjyEdiSettingService>().CacheData();
//缓存字典数据
App.GetService<ISysDictDataService>().CacheData();
//租户参数
App.GetService<IDjyTenantParamService>().CacheData();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

Write Preview
Loading…
Cancel
Save