修复新增编辑时，获取不到用户id的问题

src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs

@@ -1,6 +1,8 @@
 using AutoMapper;
+using AutoMapper.Internal.Mappers;
 using SJZY.Track.Application.Dtos.ProvideServices;
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
+using SJZY.Track.Domain.Dtos.Order;
 
 namespace SJZY.Track.Application.AutoMapper;
 
@@ -15,5 +17,8 @@ public class OrderAutoMapperProfile : Profile
             .ForMember(dest => dest.ServiceProviderId, opt => opt.MapFrom(m => m.ServiceProviderId ?? 0))
             .ForMember(dest => dest.TrackTemplateId, opt => opt.MapFrom(m => m.TemplateId));
         CreateMap<OrderFligthInfo, OrderFlightEntity>(MemberList.None);
+        
+        CreateMap<GetPageTrackOrderInput, GetPageTrackOrderInputVO>(MemberList.None);
+
     }
 }

src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs

@@ -16,7 +16,7 @@ namespace SJZY.Track.Application.Dtos.ProvideServices
         /// <summary>
         /// 单号
         /// </summary>
-        public List<string> OrderNos { get; set; }
+        public List<string>? OrderNos { get; set; }
 
         /// <summary>
         /// 创建时间开始

src/SJZY.Track.Application/SJZY.Track.Application.csproj

@@ -19,8 +19,6 @@
 	<ItemGroup>
 		<PackageReference Include="SJZY.Expand.AliyunOSS" Version="7.0.10" />
 		<PackageReference Include="SJZY.Expand.Excel" Version="7.0.5" />
-		<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.3-testbuild" />
-		<PackageReference Include="SJZY.UserCenter.SharedModel" Version="3.0.3-testbuild" />
 		<PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2" />
 		<PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2" />
 	</ItemGroup>

src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs

@@ -1,5 +1,6 @@
 using SJZY.Track.Application.Dtos.ProvideServices;
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
+using SJZY.Track.Domain.Dtos.Order;
 
 namespace SJZY.Track.Application.Services.ProvideServices;
 
@@ -86,7 +87,8 @@ public class OrderService : ApplicationService
     [HttpPost("/Order/GetTrackOrderList")]
     public async Task<UnifyPageResultDto<TrackOrderDto>> GetPageTrackOrder(GetPageTrackOrderInput input)
     {
-
+        var vo = ObjectMapper.Map<GetPageTrackOrderInput, GetPageTrackOrderInputVO>(input);
+        var jj = await _orderRepository.GetPageTrackOrder(vo);
 
         return null;
     }

src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs

@@ -6,9 +6,27 @@ using System.Threading.Tasks;
 
 namespace SJZY.Track.Domain.Dtos.Order
 {
-    public class GetPageTrackOrderInputVO
+    public class GetPageTrackOrderInputVO : PageInfoInput
     {
+        /// <summary>
+        /// 子系统id
+        /// </summary>
+        public int SubSystemId { get; set; }
 
+        /// <summary>
+        /// 单号
+        /// </summary>
+        public List<string> OrderNos { get; set; }
+
+        /// <summary>
+        /// 创建时间开始
+        /// </summary>
+        public DateTime? CreateTimeStart { get; set; }
+
+        /// <summary>
+        /// 创建时间截止
+        /// </summary>
+        public DateTime? createTimeEnd { get; set; }
     }
 
     /// <summary>
@@ -16,6 +34,22 @@ namespace SJZY.Track.Domain.Dtos.Order
     /// </summary>
     public class TrackOrderVO
     {
+        /// <summary>
+        /// 轨迹订单id
+        /// </summary>
+        public int Id { get; set; }
 
+        /// <summary>
+        /// 订单类型
+        /// </summary>
+        public string OrderType { get; set; }
+
+
+        public string OrderNumber { get; set; }
+
+        /// <summary>
+        /// 轨迹模版
+        /// </summary>
+        public string TrackTemplateNames { get; set; }
     }
 }

src/SJZY.Track.Domain/SJZY.Track.Domain.csproj

@@ -9,6 +9,7 @@
     <ItemGroup>
         <PackageReference Include="SJZY.Expand.ABP.Core" Version="7.7.1" />
         <PackageReference Include="SJZY.Expand.ElasticSearch" Version="7.0.17" />
+        <PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.3-alpha8" />
     </ItemGroup>
     
     <ItemGroup>

src/SJZY.Track.Repository/DataBaseContext.cs

@@ -1,4 +1,6 @@
 #pragma warning disable 1591
+using SJZY.UserCenter.HttpApi.Services;
+
 namespace SJZY.Track.Repository
 {
     /// <summary>
@@ -22,6 +24,17 @@ namespace SJZY.Track.Repository
                     entityInfo.SetValue(DateTime.Now);
                 if (entityInfo.PropertyName == nameof(ICreateBaicEntity.CreateUserId))
                 {
+                    if (oldValue == null || (int)oldValue == 0)
+                    {
+                        try
+                        {
+                            entityInfo.SetValue(CurrentUserRequest.CurrentUser?.UserId);
+                        }
+                        catch
+                        {
+
+                        }
+                    }
                     //entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId);
                 }
             }
@@ -32,6 +45,17 @@ namespace SJZY.Track.Repository
                     entityInfo.SetValue(DateTime.Now);
                 else if (entityInfo.PropertyName == nameof(IUpdateBasicEntity.UpdateUserId))
                 {
+                    if (oldValue == null || (int)oldValue == 1)
+                    {
+                        try
+                        {
+                            entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId);
+                        }
+                        catch
+                        {
+
+                        }
+                    }
                     //entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId);
                 }
                 //删除

src/SJZY.Track.Repository/OrderRepository.cs

@@ -81,7 +81,16 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
     public async Task<UnifyPageResultDto<TrackOrderVO>> GetPageTrackOrder(GetPageTrackOrderInputVO input)
     {
         //await Context.Queryable<OrderEntity, OrderTemplateEntity>((a,b)= );
-        //await Context.Queryable<OrderEntity,OrderTemplateEntity>((a,b)=> )
+        await Context.Queryable<OrderEntity, OrderTemplateEntity>((a, b) => new JoinQueryInfos(JoinType.Left, a.Id==b.OrderId))
+            .GroupBy((a, b) => new { a.Id })
+            .Select((a, b) => new TrackOrderVO
+            {
+                Id=a.Id,
+                OrderNumber=a.OrderNo,
+                
+                
+
+            }).ToPageListAsync(input.PageIndex, input.PageSize);
 
         return null;
     }

src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs

@@ -43,6 +43,10 @@ public class SJZYTrackRepositoryModule : AbpModule
         });
     }
 
+
+
+
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         context.Services.AddTransient(typeof(IBasicQuery<>), typeof(BasicQuery<>));