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

1

Browse Source
optimize
wet 1 year ago
parent de8c45c69b
commit a154299693
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File

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

@ -1029,18 +1029,6 @@ namespace Myshipping.Application
CreatedUserId = UserManager.UserId,
CreatedUserName = UserManager.Name
});
}
else
{
@ -1243,7 +1231,7 @@ namespace Myshipping.Application
#region 插入货运动态
//配置中所有的货物状态
var config = _goodsStatusConfig.AsQueryable().Filter(null, true).Where(config => config.CreatedUserId == entity.CreatedUserId).ToList().DistinctBy(x => x.StatusName).Select(config => new GoodsStatusQuery
var config = _goodsStatusConfig.AsQueryable().Filter(null, true).Where(config => config.CreatedUserId == main.CreatedUserId).ToList().DistinctBy(x => x.StatusName).Select(config => new GoodsStatusQuery
{
ConfigId = config.Id,
@ -1257,10 +1245,10 @@ namespace Myshipping.Application
Remark = null,
Sort = config.Sort
}).ToList();
if (config == null)
if (config.Count()==0)
{
_GoodsConfig.InitGoodsStatusConfig((long)entity.CreatedUserId, entity.CreatedUserName);
config = _goodsStatusConfig.AsQueryable().Filter(null, true).Where(config => config.CreatedUserId == entity.CreatedUserId).ToList().DistinctBy(x => x.StatusName).Select(config => new GoodsStatusQuery
_GoodsConfig.InitGoodsStatusConfig((long)main.CreatedUserId, main.CreatedUserName);
config = _goodsStatusConfig.AsQueryable().Filter(null, true).Where(config => config.CreatedUserId == main.CreatedUserId).ToList().DistinctBy(x => x.StatusName).Select(config => new GoodsStatusQuery
{
ConfigId = config.Id,
@ -1274,7 +1262,7 @@ namespace Myshipping.Application
Remark = null,
Sort = config.Sort
}).ToList();
if (!string.IsNullOrEmpty(entity.MBLNO)&& config!=null)
if (!string.IsNullOrEmpty(entity.MBLNO))
{
var ConfigId = config.Where(x => x.SystemCode == "YSDBC").Select(x => x.ConfigId).FirstOrDefault();
var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == ConfigId);
@ -1293,7 +1281,7 @@ namespace Myshipping.Application
}
}
if (!string.IsNullOrEmpty(entity.CUSTNO) && config != null)
if (!string.IsNullOrEmpty(entity.CUSTNO))
{
var ConfigId = config.Where(x => x.SystemCode == "YDC").Select(x => x.ConfigId).FirstOrDefault();
var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == ConfigId);
@ -1317,7 +1305,6 @@ namespace Myshipping.Application
{
if (!string.IsNullOrEmpty(entity.MBLNO))
{
_logger.LogInformation("ConfigId" + config.ToJsonString());
var ConfigId = config.Where(x => x.SystemCode == "YSDBC").Select(x => x.ConfigId).FirstOrDefault();
var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == ConfigId);
if (Status == null)
@ -2496,6 +2483,9 @@ namespace Myshipping.Application
{
var url = _cache.GetAllDictData().Result.FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "response_seae_billtraceRefreshurl").Value;
if (string.IsNullOrEmpty(url)) {
throw Oops.Bah("未找到相关URL,请联系管理员配置");
}
var html = await url.SetHttpMethod(HttpMethod.Post).SetQueries(new { Ids = Ids, flag = true }).SetRetryPolicy(3, 5000).SendAsAsync<RespCommon>();
_logger.LogInformation("调用运踪刷新接口返回" + html.ToJsonString());
if (html.Success != true)
@ -2506,10 +2496,6 @@ namespace Myshipping.Application
}
/// <summary>
/// 插入货运动态
/// </summary>
@ -8108,7 +8094,7 @@ namespace Myshipping.Application
/// </summary>
/// <returns></returns>
[HttpGet("/BookingOrder/GetFieldName")]
public Task<dynamic> GetFieldName()
public async Task<dynamic> GetFieldName()
{
BookingOrder order = new BookingOrder();
BookingCtn ctn = new BookingCtn();

Write Preview
Loading…
Cancel
Save