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
jianghaiqing 7 months ago
parent 3e136bdb6c 517985bde5
commit 80ada9b681
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File

20
Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs
Unescape Escape View File

@ -908,10 +908,10 @@ namespace Myshipping.Application
throw Oops.Bah("未找到数据"); throw Oops.Bah("未找到数据");
} }
if (model.BSSTATUS != "已提交") //if (model.BSSTATUS != "已提交")
{ //{
throw Oops.Bah("当前状态不能接受审核回推"); // throw Oops.Bah("当前状态不能接受审核回推");
} //}
if (recModel.Accept) if (recModel.Accept)
{ {
@ -1669,6 +1669,8 @@ namespace Myshipping.Application
SaveAuditLog($"待审核", order.Id); SaveAuditLog($"待审核", order.Id);
} }
_logger.LogInformation($"rtnList:{rtnList.ToJsonString()}");
//全部成功后，才能自动订舱和审核 //全部成功后，才能自动订舱和审核
if (rtnList.Count(x => x.Success == false) == 0) if (rtnList.Count(x => x.Success == false) == 0)
{ {
@ -1686,12 +1688,12 @@ namespace Myshipping.Application
{ {
foreach (var ordId in ordIdList) foreach (var ordId in ordIdList)
{ {
var succ = false;
try try
{ {
_logger.LogInformation($"自动订舱：{ordId}"); _logger.LogInformation($"自动订舱：{ordId}");
await PostApiSO(ordId); await PostApiSO(ordId);
_logger.LogInformation($"自动审核：{ordId}"); succ = true;
await AuditBooking(ordId, true, "系统自动审核");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -1699,6 +1701,12 @@ namespace Myshipping.Application
await AuditBooking(ordId, false, ex.Message, notFeedback: true); await AuditBooking(ordId, false, ex.Message, notFeedback: true);
throw ex; throw ex;
} }
if (succ)
{
_logger.LogInformation($"自动审核：{ordId}");
await AuditBooking(ordId, true, "系统自动审核");
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save