|
@@ -3222,7 +3222,6 @@ public class OrderController : BaseController
|
|
ExpiredTimeWithConfig expiredTimeConfig;
|
|
ExpiredTimeWithConfig expiredTimeConfig;
|
|
if (dto.Workflow.NextHandlers.Any(d => d.Key == "001171" || d.Key == "001178"))
|
|
if (dto.Workflow.NextHandlers.Any(d => d.Key == "001171" || d.Key == "001178"))
|
|
{
|
|
{
|
|
- // var timeResult = _timeLimitDomainService.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 45, 80, 50);
|
|
|
|
var timeResult = await _expireTime.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 45, 80, 50);
|
|
var timeResult = await _expireTime.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 45, 80, 50);
|
|
expiredTimeConfig = new ExpiredTimeWithConfig
|
|
expiredTimeConfig = new ExpiredTimeWithConfig
|
|
{
|
|
{
|
|
@@ -3234,22 +3233,9 @@ public class OrderController : BaseController
|
|
NearlyExpiredTimeOne = timeResult.NearlyExpiredTimeOne,
|
|
NearlyExpiredTimeOne = timeResult.NearlyExpiredTimeOne,
|
|
};
|
|
};
|
|
}
|
|
}
|
|
- //else if (dto.Workflow.FlowDirection == EFlowDirection.CenterToCenter)
|
|
|
|
- //{
|
|
|
|
- // var timeResult = _timeLimitDomainService.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 1, 0);
|
|
|
|
- // expiredTimeConfig = new ExpiredTimeWithConfig
|
|
|
|
- // {
|
|
|
|
- // Count = 1,
|
|
|
|
- // TimeType = ETimeType.WorkDay,
|
|
|
|
- // TimeText = "1个工作日",
|
|
|
|
- // ExpiredTime = timeResult.EndTime,
|
|
|
|
- // NearlyExpiredTime = timeResult.NearlyExpiredTime
|
|
|
|
- // };
|
|
|
|
- //}
|
|
|
|
else
|
|
else
|
|
{
|
|
{
|
|
//期满时间
|
|
//期满时间
|
|
- //expiredTimeConfig = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToOrg, order.AcceptTypeCode);
|
|
|
|
expiredTimeConfig = await _expireTime.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToOrg, order.Adapt<OrderTimeClacInfo>());
|
|
expiredTimeConfig = await _expireTime.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToOrg, order.Adapt<OrderTimeClacInfo>());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -3278,21 +3264,6 @@ public class OrderController : BaseController
|
|
}
|
|
}
|
|
//开启流程处理事件,处理市州互转
|
|
//开启流程处理事件,处理市州互转
|
|
await _publisher.PublishAsync(new OrderStartWorkflowNotify(order.Id), PublishStrategy.ParallelWhenAll, HttpContext.RequestAborted);
|
|
await _publisher.PublishAsync(new OrderStartWorkflowNotify(order.Id), PublishStrategy.ParallelWhenAll, HttpContext.RequestAborted);
|
|
- //{
|
|
|
|
- // var order = await _orderRepository.GetAsync(id, HttpContext.RequestAborted);
|
|
|
|
- // var orderDto = _mapper.Map<OrderDto>(order);
|
|
|
|
- // await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderTranspondCity, orderDto);
|
|
|
|
- // //保存本地数据
|
|
|
|
- // TranspondCityRawData cityRawData = new TranspondCityRawData
|
|
|
|
- // {
|
|
|
|
- // OrderCode = order.No,
|
|
|
|
- // TransferOutTime = DateTime.Now,
|
|
|
|
- // CityName = order.TranspondCityName,
|
|
|
|
- // Direction = ETranspondDirection.Out
|
|
|
|
- // };
|
|
|
|
-
|
|
|
|
- // await _transpondCityRawDataRepository.AddAsync(cityRawData, HttpContext.RequestAborted);
|
|
|
|
- //}
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|