From 90fd55c32556aa24284d7e7775277751db147f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Wed, 28 Feb 2024 10:08:30 +0800
Subject: [PATCH] =?UTF-8?q?change=20=E8=AE=A2=E5=8D=95=E8=81=9A=E5=90=88?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/ProvideServices/CreateOrderInput.cs  |  2 +-
 .../Dtos/ProvideServices/LinkOrderInput.cs    |  6 +--
 .../Services/ProvideServices/OrderService.cs  |  8 ++--
 .../OrderAggregate/OrderLinkEntity.cs         | 43 +++++++++++++++----
 .../OrderAggregate/OrderTemplateEntity.cs     |  4 +-
 5 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/SJZY.Track.Application/Dtos/ProvideServices/CreateOrderInput.cs b/src/SJZY.Track.Application/Dtos/ProvideServices/CreateOrderInput.cs
index b5b6520a..52d9545f 100644
--- a/src/SJZY.Track.Application/Dtos/ProvideServices/CreateOrderInput.cs
+++ b/src/SJZY.Track.Application/Dtos/ProvideServices/CreateOrderInput.cs
@@ -4,7 +4,7 @@ namespace SJZY.Track.Application.Dtos.ProvideServices;
 
 public class CreateOrderInput
 {
-    public OrderInfo OrderInfo { get; set; }
+    public NoInfo NoInfo { get; set; }
 
     /// <summary>
     /// 客户id
diff --git a/src/SJZY.Track.Application/Dtos/ProvideServices/LinkOrderInput.cs b/src/SJZY.Track.Application/Dtos/ProvideServices/LinkOrderInput.cs
index a9177890..0d3a972a 100644
--- a/src/SJZY.Track.Application/Dtos/ProvideServices/LinkOrderInput.cs
+++ b/src/SJZY.Track.Application/Dtos/ProvideServices/LinkOrderInput.cs
@@ -4,13 +4,13 @@ namespace SJZY.Track.Application.Dtos.ProvideServices;
 
 public class LinkOrderInput
 {
-    public OrderInfo OrderInfo { get; set; }
+    public NoInfo NoInfo { get; set; }
 
-    public List<OrderInfo> LinkedOrderInfos { get; set; }
+    public List<NoInfo> LinkedOrderInfos { get; set; }
 }
 
 
-public class OrderInfo
+public class NoInfo
 {
     /// <summary>
     /// 订单类型
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
index fa526c1e..27ebcbb5 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
@@ -29,17 +29,17 @@ public class OrderService: ApplicationService
     public async Task<bool> CreateOrderAsync(CreateOrderInput input)
     {
         if (await _orderRepository.IsAnyAsync(x =>
-                x.OrderType == input.OrderInfo.NoType && x.OrderNo == input.OrderInfo.OrderNo))
+                x.OrderType == input.NoInfo.NoType && x.OrderNo == input.NoInfo.OrderNo))
         {
-            throw new BusinessException(message: $"单号：{input.OrderInfo.OrderNo}已存在");
+            throw new BusinessException(message: $"单号：{input.NoInfo.OrderNo}已存在");
         }
 
         var order = new OrderEntity
         {
             CustomId = input.ClientId,
             OrderDetails = JsonConvert.SerializeObject(input.Details),
-            OrderNo = input.OrderInfo.OrderNo,
-            OrderType = input.OrderInfo.NoType,
+            OrderNo = input.NoInfo.OrderNo,
+            OrderType = input.NoInfo.NoType,
             SubSystemId = CurrentUserRequest.SubSystemId
         };
 
diff --git a/src/SJZY.Track.Domain/OrderAggregate/OrderLinkEntity.cs b/src/SJZY.Track.Domain/OrderAggregate/OrderLinkEntity.cs
index fecb1812..7f8cbb5d 100644
--- a/src/SJZY.Track.Domain/OrderAggregate/OrderLinkEntity.cs
+++ b/src/SJZY.Track.Domain/OrderAggregate/OrderLinkEntity.cs
@@ -4,7 +4,8 @@
 /// 轨迹订单关联表（1：N）
 /// </summary>
 [SugarTable("t_order_link")]
-public class OrderLinkEntity : IFullAuditedBasicEntitys
+public class OrderLinkEntity : ICreateBaicEntity,
+    ISoftDeleteBasicEntity
 {
 
     /// <summary>
@@ -14,15 +15,41 @@ public class OrderLinkEntity : IFullAuditedBasicEntitys
     public int Id { get; set; }
 
     /// <summary>
-    /// 关联的订单id
+    /// 订单类型
     /// </summary>
-    [SugarColumn(ColumnName = "LinkOrderId")]
-    public int LinkOrderId { get; set; }
+    [SugarColumn(ColumnName = "OrderType")]
+    public int OrderType { get; set; }
+    
+    /// <summary>
+    /// 订单号
+    /// </summary>
+    [SugarColumn(ColumnName = "OrderNo")]
+    public string OrderNo { get; set; }
+    
+    /// <summary>
+    /// 关联的订单类型
+    /// </summary>
+    [SugarColumn(ColumnName = "LinkOrderType")]
+    public int LinkOrderType { get; set; }
+    
+    /// <summary>
+    /// 关联的订单号
+    /// </summary>
+    [SugarColumn(ColumnName = "LinkOrderNo")]
+    public string LinkOrderNo { get; set; }
 
     /// <summary>
-    /// 订单id
+    /// 创建人
     /// </summary>
-    [SugarColumn(ColumnName = "OrderId")]
-    public int OrderId { get; set; }
-
+    public int CreateUserId { get; set; }
+    
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? CreateTime { get; set; }
+    
+    /// <summary>
+    /// 是否删除（已解绑）
+    /// </summary>
+    public bool IsDeleted { get; set; }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/OrderAggregate/OrderTemplateEntity.cs b/src/SJZY.Track.Domain/OrderAggregate/OrderTemplateEntity.cs
index 9f9da293..fcff4ede 100644
--- a/src/SJZY.Track.Domain/OrderAggregate/OrderTemplateEntity.cs
+++ b/src/SJZY.Track.Domain/OrderAggregate/OrderTemplateEntity.cs
@@ -4,7 +4,7 @@
 /// 轨迹订单模板表（1：N）
 /// </summary>
 [SugarTable("t_order_template")]
-public class OrderTemplateEntity : IFullAuditedBasicEntitys
+public class OrderTemplateEntity : ICreateBaicEntity
 {
 
     /// <summary>
@@ -31,4 +31,6 @@ public class OrderTemplateEntity : IFullAuditedBasicEntitys
     [SugarColumn(ColumnName = "TrackTemplateId")]
     public int TrackTemplateId { get; set; }
 
+    public int CreateUserId { get; set; }
+    public DateTime? CreateTime { get; set; }
 }
\ No newline at end of file