Parcourir la source

Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

xf il y a 7 mois
Parent
commit
88e0afd898
1 fichiers modifiés avec 13 ajouts et 15 suppressions
  1. 13 15
      src/Hotline.Api/Controllers/OrderController.cs

+ 13 - 15
src/Hotline.Api/Controllers/OrderController.cs

@@ -942,10 +942,6 @@ public class OrderController : BaseController
             var callNative = await _callNativeRepository.GetReplyVoiceOrDefaultByOrderIdAsync(orderVisit.OrderId);
             seat.VoiceEvaluate = callNative;
         }
-        else if(seat.VoiceEvaluate == null)
-        {   // 如果不是 待回访, 并且 语音评价是空, 就默认 "默认评价"
-            seat.VoiceEvaluate = EVoiceEvaluate.DefaultSatisfied;
-        }
         return new
         {
             OrderVisitModel = _mapper.Map<OrderVisitDto>(orderVisit),
@@ -1028,23 +1024,25 @@ public class OrderController : BaseController
             .Where(m => m.VisitId == visit.VisitId)
             .ToListAsync();
                 var seatDetail = details.First(m => m.VisitTarget == EVisitTarget.Seat);
+                var seatDetailDto = new VisitDetailDto()
+                {
+                    Id = seatDetail.Id,
+                    VisitId = visit.VisitId,
+                    VisitContent = dto.SeatVisitContent,
+                    SeatEvaluate = dto.SeatEvaluate,
+                    VisitTarget = EVisitTarget.Seat,
+                };
+                if (seatDetail.VoiceEvaluate == null)
+                    seatDetailDto.VoiceEvaluate = EVoiceEvaluate.DefaultSatisfied;
+
                 var visitDto = new VisitDto
                 {
                     Id = visit.VisitId,
                     IsPutThrough = true,
                     IsAgain = false,
-                    VisitDetails = new List<VisitDetailDto>
-                    {
-            new()
-            {
-                Id = seatDetail.Id,
-                VisitId = visit.VisitId,
-                VisitContent = dto.SeatVisitContent,
-                SeatEvaluate = dto.SeatEvaluate,
-                VisitTarget = EVisitTarget.Seat,
-            }
-                    }
+                    VisitDetails = new List<VisitDetailDto>()
                 };
+                visitDto.VisitDetails.Add(seatDetailDto);
 
                 var orgDetails = details.Where(m => m.VisitTarget == EVisitTarget.Org).ToList();
                 foreach (var orgDetail in orgDetails)