소스 검색

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

tangjiang 3 주 전
부모
커밋
fd039ad510
2개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      src/Hotline.Api/Controllers/OrderController.cs
  2. 3 1
      src/Hotline/Snapshot/Services/SnapshotPointsDomainService.cs

+ 1 - 0
src/Hotline.Api/Controllers/OrderController.cs

@@ -9419,6 +9419,7 @@ public class OrderController : BaseController
     {
         var (total, items) = await _orderCopyRepository.Queryable()
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.No.Contains(dto.Keyword!))
+            .WhereIF(_appOptions.Value.IsLuZhou,x=>x.AuditSource == EOrderUpdateSource.Alter)
             .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));

+ 3 - 1
src/Hotline/Snapshot/Services/SnapshotPointsDomainService.cs

@@ -30,7 +30,9 @@ public class SnapshotPointsDomainService : ISnapshotPointsDomainService, IScopeD
             .Where((snapshot, industry) => snapshot.Id == orderId)
             .Select((snapshot, industry) => new { snapshot.Id, industry.ReportPoints , industry.ArgeePoints , industry.RefusePoints,  industry.Name,
                 snapshot.CreatorId})
-            .FirstAsync() ?? throw new UserFriendlyException($"{orderId} 工单不存在");
+            .FirstAsync();
+        if (order == null) return;
+        
         if (order.ReportPoints.HasValue == false)
             throw new UserFriendlyException($"{order.Name} 行业未配置积分");