Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/IPPbxController.cs

@@ -157,8 +157,9 @@ namespace Hotline.Api.Controllers
         [HttpPost("receivecallrecord")]
         public async Task<OpenResponse> ReceiveCallRecord([FromQuery]ReceiveCallRecordDto dto)
         {
-            var result = JsonSerializer.Serialize(dto);
-            _logger.LogInformation($"收到通话记录:{ result }");
+            _logger.LogInformation($"收到通话记录：{ Request.QueryString }");
+            //var result = JsonSerializer.Serialize(dto);
+            //_logger.LogInformation($"收到通话记录:{ result }");
             var model = _mapper.Map<TrCallRecord>(dto);
             await _trCallRecordRepository.AddAsync(model, HttpContext.RequestAborted);
             return OpenResponse.Ok("success");

src/Hotline.Api/Controllers/OrderController.cs

@@ -240,7 +240,11 @@ public class OrderController : BaseController
         orderVisit.VisitState = EVisitState.WaitForVisit;
         orderVisit.PublishTime = DateTime.Now;
         orderVisit.IsCanHandle = true;
-        string visitId = await _orderVisitRepository.AddAsync(orderVisit);
+        if (order is { ProcessType: EProcessType.Zhiban, CounterSignType: null })
+        {
+            orderVisit.VisitState = EVisitState.Visited;
+		}
+		string visitId = await _orderVisitRepository.AddAsync(orderVisit);
 
         //新增回访信息
         var visitedDetail = new List<OrderVisitDetail>();
@@ -248,26 +252,30 @@ public class OrderController : BaseController
         var seatDetail = new OrderVisitDetail();
         seatDetail.VisitId = visitId;
         seatDetail.VisitTarget = EVisitTarget.Seat;
-        if (order.ProcessType == EProcessType.Zhiban && order.CounterSignType is null)
-        {
-	        seatDetail.VoiceEvaluate = EVoiceEvaluate.Satisfied;
-	        seatDetail.SeatEvaluate = ESeatEvaluate.Satisfied;
-	        order.Visited("1", "满意");
-	        await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
-			visitedDetail.Add(seatDetail);
+		foreach (var item in dto.IdNames)
+		{
+			var orgDetail = new OrderVisitDetail();
+			orgDetail.VisitId = visitId;
+			orgDetail.VisitOrgCode = item.Key;
+			orgDetail.VisitOrgName = item.Value;
+			orgDetail.VisitTarget = EVisitTarget.Org;
+            if (order is { ProcessType: EProcessType.Zhiban, CounterSignType: null }) {
+	            var satisfy = new Kv() { Key = "4", Value = "满意" };
+	            orgDetail.OrgProcessingResults = satisfy;
+	            orgDetail.OrgHandledAttitude = satisfy;
+			}
+			visitedDetail.Add(orgDetail);
 		}
-		else{
-            foreach (var item in dto.IdNames)
-            {
-                var orgDetail = new OrderVisitDetail();
-                orgDetail.VisitId = visitId;
-                orgDetail.VisitOrgCode = item.Key;      
-                orgDetail.VisitOrgName = item.Value;
-                orgDetail.VisitTarget = EVisitTarget.Org;
-				visitedDetail.Add(orgDetail);
-            }
-        }
-        await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail, HttpContext.RequestAborted);
+		if (order is { ProcessType: EProcessType.Zhiban, CounterSignType: null })
+		{
+			seatDetail.VoiceEvaluate = EVoiceEvaluate.Satisfied;
+			seatDetail.SeatEvaluate = ESeatEvaluate.Satisfied;
+			order.Visited("4", "满意");
+			order.Status = EOrderStatus.Visited;
+			await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
+		}
+		visitedDetail.Add(seatDetail);
+		await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail, HttpContext.RequestAborted);
 		await _mediator.Publish(new AddVisitNotify{ OrderVisitedDetails =  visitedDetail }, HttpContext.RequestAborted);
 
         //TODO 中国政府网