|
@@ -719,7 +719,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
/// <returns></returns>
|
|
|
public async Task<Order> SaveOrderWorkflowInfo(NextWorkflowDto<OrderHandleFlowDto> dto, CancellationToken cancellationToken)
|
|
|
{
|
|
|
- var order = await _orderRepository.Queryable()
|
|
|
+ var order = await _orderRepository.Queryable().Includes(d=>d.OrderExtension)
|
|
|
.FirstAsync(d => d.Id == dto.Data.OrderId, cancellationToken)
|
|
|
?? throw UserFriendlyException.SameMessage("无效工单编号");
|
|
|
if (await _orderSendBackAuditRepository.AnyAsync(x => x.OrderId == order.Id && x.State == ESendBackAuditState.Apply,
|
|
@@ -733,6 +733,10 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
CityBaseConfiguration cityBase = System.Text.Json.JsonSerializer.Deserialize<CityBaseConfiguration>(settingBase);
|
|
|
if (dto.Workflow.NextHandlers.Any(d => d.Key == cityBase.CityProvince.OrgId || d.Key == cityBase.CityProvinceAssign.OrgId))
|
|
|
{
|
|
|
+ if (dto.Workflow.NextHandlers.Any(d => d.Key == cityBase.CityProvince.OrgId) && order.OrderExtension is null)
|
|
|
+ {
|
|
|
+ throw UserFriendlyException.SameMessage("该工单不存在拓展信息,不能推送至全国12315平台!");
|
|
|
+ }
|
|
|
var timeResult = await _expireTime.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 45, 80, 50);
|
|
|
expiredTimeConfig = new ExpiredTimeWithConfig
|
|
|
{
|