From 7206bc64cd474f26d3e8d2a6f325eaf2e8a8f823 Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Thu, 5 Sep 2024 14:28:20 +0800
Subject: [PATCH] =?UTF-8?q?change=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=88=A0=E6=94=B9=E8=BF=94=E5=9B=9Eid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/IOrderService.cs                 |  4 +--
 .../Services/ProvideServices/OrderService.cs  | 30 +++++++++----------
 .../OrderAggregate/IOrderRepository.cs        |  2 +-
 .../Repositories/OrderRepository.cs           |  4 ++-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs
index 5a1b4067..f36dc7da 100644
--- a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs
+++ b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs
@@ -10,14 +10,14 @@ public interface IOrderService : IRemoteService
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    Task<UnifyResultDto> UpsertAsync(UpsertOrderInput input);
+    Task<UnifyResultDto<IdBaseDto>> UpsertAsync(UpsertOrderInput input);
 
     /// <summary>
     /// 删除订单
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    Task<UnifyResultDto> DeleteOrderAsync(DeleteOrderInput input);
+    Task<UnifyResultDto<IdBaseDto>> DeleteOrderAsync(DeleteOrderInput input);
 
     /// <summary>
     /// 关联订单
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
index 7818fd9e..4d25a09a 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
@@ -32,7 +32,7 @@ public partial class OrderService : ApplicationService, IOrderService
     /// <param name="input"></param>
     /// <returns></returns>
     [HttpPost("Order/Upsert")]
-    public async Task<UnifyResultDto> UpsertAsync(UpsertOrderInput input)
+    public async Task<UnifyResultDto<IdBaseDto>> UpsertAsync(UpsertOrderInput input)
     {
         var subSystemId = CurrentUserRequest.SubSystemId;
 
@@ -44,25 +44,21 @@ public partial class OrderService : ApplicationService, IOrderService
             // 订单已存在则视为更新
             await UpdateOrderAsync(input, order);
 
-            return new UnifyResultDto()
+            return new UnifyResultDto<IdBaseDto>(true, new IdBaseDto
             {
-                Code = "200",
-                Msg = "操作成功",
-                Data = "创建成功"
-            };
+                Id = order.Id
+            });
         }
 
         order = ObjectMapper.Map<UpsertOrderInput, OrderEntity>(input);
         order.SubSystemId = subSystemId;
         order.OrderFlights = ObjectMapper.Map<List<OrderFlightInfo>, List<OrderFlightEntity>>(input.FlightInfos);
 
-        await _orderRepository.CreateOrderAsync(order);
-        return new UnifyResultDto()
+        var orderId = await _orderRepository.CreateOrderAsync(order);
+        return new UnifyResultDto<IdBaseDto>(true, new IdBaseDto
         {
-            Code = "200",
-            Msg = "操作成功",
-            Data = "新增成功"
-        };
+            Id = orderId
+        });
     }
 
     /// <summary>
@@ -72,10 +68,11 @@ public partial class OrderService : ApplicationService, IOrderService
     /// <returns></returns>
     /// <exception cref="BusinessException"></exception>
     [HttpPost("Order/Delete")]
-    public async Task<UnifyResultDto> DeleteOrderAsync(DeleteOrderInput input)
+    public async Task<UnifyResultDto<IdBaseDto>> DeleteOrderAsync(DeleteOrderInput input)
     {
+        var susSystemId = CurrentUserRequest.SubSystemId;
         var orderId = await _orderRepository.GetFirstAsync(x =>
-            x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id);
+            x.SubSystemId == susSystemId && x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id);
         if (orderId == default)
         {
             throw new BusinessException(message: $"订单：{input.OrderNo}不存在");
@@ -83,7 +80,10 @@ public partial class OrderService : ApplicationService, IOrderService
 
         await _orderRepository.DeleteOrderAsync(orderId);
 
-        return new UnifyResultDto(true, true);
+        return new UnifyResultDto<IdBaseDto>(true, new IdBaseDto
+        {
+            Id = orderId
+        });
     }
 
     private async Task UpdateOrderAsync(UpdateOrderInput input, OrderEntity order)
diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
index 3ff7261a..767aefd5 100644
--- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
@@ -9,7 +9,7 @@ public interface IOrderRepository : IBasicRepository<OrderEntity>
     /// </summary>
     /// <param name="order"></param>
     /// <returns></returns>
-    Task CreateOrderAsync(OrderEntity order);
+    Task<int> CreateOrderAsync(OrderEntity order);
 
     /// <summary>
     /// 更新订单
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index e28b4f25..b89ed57c 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -6,7 +6,7 @@ namespace SJZY.Track.Repository.Repositories;
 
 public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, ITransientDependency
 {
-    public async Task CreateOrderAsync(OrderEntity order)
+    public async Task<int> CreateOrderAsync(OrderEntity order)
     {
         using var tran = TransactionHelper.GetReadCommitted();
 
@@ -15,6 +15,8 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
         await Context.Insertable(order.OrderFlights).ExecuteCommandAsync();
 
         tran.Complete();
+
+        return orderId;
     }
 
     public Task<int> UpdateBatchIdsAsync(List<int> ids, int newValue)