Merge branch 'S01-轨迹中台' into test

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs

@@ -7,6 +7,7 @@ public class UpsertOrderInput : UpdateOrderInput
     /// <summary>
     /// 客户id
     /// </summary>
+    [Required]
     public int CustomId { get; set; }
 }
 

src/SJZY.Track.Repository/Repositories/OrderRepository.cs

@@ -61,17 +61,16 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
     public async Task<List<LinkedOrderVO>> GetLinkedOrdersAsync(int orderId)
     {
         return await Context.Queryable<OrderLinkEntity>()
-            .LeftJoin<OrderLinkEntity>((a, b) => a.Id == b.OrderId)
+            .LeftJoin<OrderEntity>((a, b) => a.LinkOrderId == b.Id)
-            .LeftJoin<OrderEntity>((a, b, c) => b.LinkOrderId == c.Id)
             .Where(a => a.OrderId == orderId)
-            .Select((a, b, c) => new LinkedOrderVO
+            .Select((a, b) => new LinkedOrderVO
             {
-                OrderId = c.Id,
+                OrderId = b.Id,
-                OrderType = c.OrderType,
+                OrderType = b.OrderType,
-                OrderNo = c.OrderNo,
+                OrderNo = b.OrderNo,
-                SubSystemId = c.SubSystemId,
+                SubSystemId = b.SubSystemId,
-                IsPushCompleted = c.IsPushCompleted,
+                IsPushCompleted = b.IsPushCompleted,
-                CustomId = c.CustomId
+                CustomId = b.CustomId
             })
             .ToListAsync();
     }