diff --git a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs
index 4aaee6f4..7fb5f092 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs
@@ -65,6 +65,7 @@ public class OrdersController : ControllerBase
///
///
[HttpPost("booking")]
+ [Transactional]
public async Task Booking(BookingMealRequest request)
{
await _orderService.Booking(request);
diff --git a/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs
deleted file mode 100644
index 956a1ac6..00000000
--- a/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using Dlhis.Entity.Canteen.Enums;
-using Kurisu.AspNetCore.Utils.Extensions;
-
-namespace Dlhis.Canteen.Order.Response;
-
-public class GetDetailResponse
-{
- ///
- /// 订单号
- ///
- public string ThirdNo { get; set; }
-
- ///
- /// 营业日
- ///
- public DateOnly SysDate { get; set; }
-
- ///
- /// 餐次
- ///
- public ShiftEnumType ShiftType { get; set; }
-
- ///
- /// 餐次CN
- ///
- public string ShiftTypeCN => ShiftType.GetDescription();
-
- ///
- /// 菜品编码
- ///
- public Guid DishesCode { get; set; }
-
- ///
- /// 菜品名称
- ///
- public string DishesName { get; set; }
-
- ///
- /// 单价
- ///
- public decimal Price { get; set; }
-
- ///
- /// 单位
- ///
- public string Unit { get; set; }
-
- ///
- /// 数量
- ///
- public int Num { get; set; }
-
- ///
- /// 金额
- ///
- public decimal Amount { get; set; }
-
- ///
- /// 订单明细状态
- ///
- public OrderDetailsStatusEnumType OrderStatus { get; set; }
-
- ///
- /// 订单明细状态CN
- ///
- public string OrderStatusCN => OrderStatus.GetDescription();
-}
\ No newline at end of file
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 5b04f4fd..040f13b7 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -172,7 +172,7 @@ public class OrderService : IOrderService
var balanceRecord = order.Adapt();
await _dbContext.InsertAsync(balanceRecord);
- await _dbContext.InsertAsync(new OrderDetailEntity
+ await _dbContext.InsertAsync(new CanteenOrderDetailEntity
{
OrderNo = order.No,
DishesCode = request.DishesCode,
diff --git a/Src/Dlhis.Entity/Canteen/Entities/OrderDetailEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderDetailEntity.cs
similarity index 64%
rename from Src/Dlhis.Entity/Canteen/Entities/OrderDetailEntity.cs
rename to Src/Dlhis.Entity/Canteen/Entities/CanteenOrderDetailEntity.cs
index 53b59bd9..80d30b52 100644
--- a/Src/Dlhis.Entity/Canteen/Entities/OrderDetailEntity.cs
+++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderDetailEntity.cs
@@ -1,16 +1,14 @@
-using Dlhis.Entity.Canteen.Enums;
-using Kurisu.Core.DataAccess.Entity;
+using Kurisu.Core.DataAccess.Entity;
using Kurisu.SqlSugar;
using SqlSugar;
-using SqlSugar.DbConvert;
namespace Dlhis.Entity.Canteen.Entities;
///
/// 订餐明细表
///
-[SugarTable(TableName = "OrderDetail", TableDescription = "订单明细表")]
-public class OrderDetailEntity : SugarBaseEntity, ITenantId
+[SugarTable(TableName = "CanteenOrderDetail", TableDescription = "订单明细表")]
+public class CanteenOrderDetailEntity : SugarBaseEntity, ITenantId
{
///
/// 订单号
@@ -42,13 +40,5 @@ public class OrderDetailEntity : SugarBaseEntity, ITenantId
[SugarColumn(ColumnDescription = "单位")]
public string Unit { get; set; }
-
- ///
- /// 订单明细状态
- ///
- [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "状态")]
- public OrderDetailsStatusEnumType Status { get; set; }
-
-
public string TenantId { get; set; }
}
diff --git a/Src/Dlhis.Entity/Canteen/Enums/MiniProgramOrderStatusEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/MiniProgramOrderStatusEnumType.cs
deleted file mode 100644
index 56eb9ba1..00000000
--- a/Src/Dlhis.Entity/Canteen/Enums/MiniProgramOrderStatusEnumType.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Dlhis.Entity.Canteen.Enums
-{
- public enum MiniProgramOrderStatusEnumType
- {
- ///
- /// 有效
- ///
- [Description("有效")]
- I = 1,
-
- ///
- /// 取消
- ///
- [Description("取消")]
- C = 2,
-
- ///
- /// 退单
- ///
- [Description("退单")]
- X = 3,
-
- ///
- /// 免单
- ///
- [Description("免单")]
- Z = 4,
- }
-}
diff --git a/Src/Dlhis.Entity/Canteen/Enums/OrderDetailsStatusEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/OrderDetailsStatusEnumType.cs
deleted file mode 100644
index 0b4eed43..00000000
--- a/Src/Dlhis.Entity/Canteen/Enums/OrderDetailsStatusEnumType.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.ComponentModel;
-
-namespace Dlhis.Entity.Canteen.Enums
-{
- ///
- /// 订单明细状态 OrderDetailsStatusEnumType
- ///
- [Description("订单明细状态")]
- public enum OrderDetailsStatusEnumType
- {
- ///
- /// 有效
- ///
- [Description("有效")]
- I = 1,
- }
-}