xf 9 months ago
parent
commit
4fff175eda

+ 15 - 13
src/Hotline.Application/Handlers/FlowEngine/WorkflowEndHandler.cs

@@ -212,23 +212,25 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
                 // {
                 //     orderFlowDto.TrCallRecordDto = _mapper.Map<TrCallDto>(callRecord);
                 // }
-                
-                if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.TianRun)
+                if (order.SourceChannelCode == AppDefaults.SourceChannel.DianHua)
                 {
-                    // var callRecord = await _trCallRecordRepository.GetAsync(p => p.OtherAccept == order.CallId, cancellationToken);
-                    var callRecord = await _callApplication.GetTianrunCallAsync(order.CallId, cancellationToken);
-                    if (callRecord != null)
+                    if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.TianRun)
                     {
-                        orderFlowDto.TrCallRecordDto = _mapper.Map<TrCallDto>(callRecord);
+                        // var callRecord = await _trCallRecordRepository.GetAsync(p => p.OtherAccept == order.CallId, cancellationToken);
+                        var callRecord = await _callApplication.GetTianrunCallAsync(order.CallId, cancellationToken);
+                        if (callRecord != null)
+                        {
+                            orderFlowDto.TrCallRecordDto = _mapper.Map<TrCallDto>(callRecord);
+                        }
+                    }
+                    else if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.XingTang)
+                    {
+                        var call = await _callApplication.GetCallAsync(order.CallId, cancellationToken);
+                        if (call is not null)
+                            orderFlowDto.TrCallRecordDto = _mapper.Map<TrCallDto>(call);
                     }
                 }
-                else if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.XingTang)
-                {
-                    var call = await _callApplication.GetCallAsync(order.CallId, cancellationToken);
-                    if(call is not null)
-                        orderFlowDto.TrCallRecordDto = _mapper.Map<TrCallDto>(call);
-                }
-                
+
                 //这里需要判断是否是警情退回
                 orderFlowDto.IsNonPoliceReturn = notification.Dto.External == null ? false : notification.Dto.External.IsPoliceReturn;
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderFiled, orderFlowDto, cancellationToken: cancellationToken);

+ 14 - 12
src/Hotline.Application/Handlers/FlowEngine/WorkflowStartHandler.cs

@@ -110,21 +110,23 @@ namespace Hotline.Application.Handlers.FlowEngine
                     //     publishCallRecordDto.TrCallRecordDto = _mapper.Map<TrCallDto>(callRecord);
                     // }
 
-
-                    if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.TianRun)
+                    if (order.SourceChannelCode == AppDefaults.SourceChannel.DianHua)
                     {
-                        // var callRecord = await _trCallRecordRepository.GetAsync(p => p.OtherAccept == order.CallId, cancellationToken);
-                        var callRecord = await _callApplication.GetTianrunCallAsync(order?.CallId, cancellationToken);
-                        if (callRecord != null)
+                        if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.TianRun)
                         {
-                            publishCallRecordDto.TrCallRecordDto = _mapper.Map<TrCallDto>(callRecord);
+                            // var callRecord = await _trCallRecordRepository.GetAsync(p => p.OtherAccept == order.CallId, cancellationToken);
+                            var callRecord = await _callApplication.GetTianrunCallAsync(order?.CallId, cancellationToken);
+                            if (callRecord != null)
+                            {
+                                publishCallRecordDto.TrCallRecordDto = _mapper.Map<TrCallDto>(callRecord);
+                            }
+                        }
+                        else if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.XingTang)
+                        {
+                            var call = await _callApplication.GetCallAsync(order?.CallId, cancellationToken);
+                            if (call is not null)
+                                publishCallRecordDto.TrCallRecordDto = _mapper.Map<TrCallDto>(call);
                         }
-                    }
-                    else if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.XingTang)
-                    {
-                        var call = await _callApplication.GetCallAsync(order?.CallId, cancellationToken);
-                        if(call is not null)
-                            publishCallRecordDto.TrCallRecordDto = _mapper.Map<TrCallDto>(call);
                     }