|
@@ -5478,14 +5478,12 @@ public class OrderController : BaseController
|
|
// 宜宾需求: 1.是否是派单节点 2.是否存在历史派单节点 3.存在获取上个派单节点 4.不存在走平均派单 过滤历史派单节点不为派单池
|
|
// 宜宾需求: 1.是否是派单节点 2.是否存在历史派单节点 3.存在获取上个派单节点 4.不存在走平均派单 过滤历史派单节点不为派单池
|
|
if (_appOptions.Value.IsYiBin || _appOptions.Value.IsZiGong)
|
|
if (_appOptions.Value.IsYiBin || _appOptions.Value.IsZiGong)
|
|
{
|
|
{
|
|
- var sendOrderTraces =
|
|
|
|
- workflow.Traces.Where(x => x.BusinessType == EBusinessType.Send && x.HandlerId != AppDefaults.SendPoolId);
|
|
|
|
- if (sendOrderTraces.Any())
|
|
|
|
|
|
+ var sendOrderTrace = workflow.Traces
|
|
|
|
+ .Where(x => x.BusinessType == EBusinessType.Send && x.HandlerId != AppDefaults.SendPoolId)
|
|
|
|
+ .MaxBy(x => x.CreationTime);
|
|
|
|
+ if (sendOrderTrace is not null)
|
|
{
|
|
{
|
|
- var sendOrderTrace = workflow.Traces
|
|
|
|
- .Where(x => x.BusinessType == EBusinessType.Send && x.HandlerId != AppDefaults.SendPoolId)
|
|
|
|
- .OrderByDescending(x => x.CreationTime)
|
|
|
|
- .FirstOrDefault();
|
|
|
|
|
|
+ //todo
|
|
nextDto.NextHandlers = new List<StepAssignInfo>
|
|
nextDto.NextHandlers = new List<StepAssignInfo>
|
|
{
|
|
{
|
|
new()
|
|
new()
|
|
@@ -5696,11 +5694,11 @@ public class OrderController : BaseController
|
|
|
|
|
|
private async Task AverageSendOrderAsync(NextWorkflowDto nextDto, CancellationToken cancellationToken)
|
|
private async Task AverageSendOrderAsync(NextWorkflowDto nextDto, CancellationToken cancellationToken)
|
|
{
|
|
{
|
|
- // 平均派单
|
|
|
|
- var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
|
|
|
|
- if (averageSendOrder)
|
|
|
|
|
|
+ if (!nextDto.NextHandlers.Any())
|
|
{
|
|
{
|
|
- if (!nextDto.NextHandlers.Any())
|
|
|
|
|
|
+ // 平均派单
|
|
|
|
+ var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
|
|
|
|
+ if (averageSendOrder)
|
|
{
|
|
{
|
|
var handler = await _orderDomainService.AverageOrder(cancellationToken);
|
|
var handler = await _orderDomainService.AverageOrder(cancellationToken);
|
|
nextDto.NextHandlers = new List<StepAssignInfo> { handler };
|
|
nextDto.NextHandlers = new List<StepAssignInfo> { handler };
|