fix 表名称调整
This commit is contained in:
@@ -65,6 +65,7 @@ public class OrdersController : ControllerBase
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost("booking")]
|
||||
[Transactional]
|
||||
public async Task Booking(BookingMealRequest request)
|
||||
{
|
||||
await _orderService.Booking(request);
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
using Dlhis.Entity.Canteen.Enums;
|
||||
using Kurisu.AspNetCore.Utils.Extensions;
|
||||
|
||||
namespace Dlhis.Canteen.Order.Response;
|
||||
|
||||
public class GetDetailResponse
|
||||
{
|
||||
/// <summary>
|
||||
/// 订单号
|
||||
/// </summary>
|
||||
public string ThirdNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 营业日
|
||||
/// </summary>
|
||||
public DateOnly SysDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 餐次
|
||||
/// </summary>
|
||||
public ShiftEnumType ShiftType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 餐次CN
|
||||
/// </summary>
|
||||
public string ShiftTypeCN => ShiftType.GetDescription();
|
||||
|
||||
/// <summary>
|
||||
/// 菜品编码
|
||||
/// </summary>
|
||||
public Guid DishesCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 菜品名称
|
||||
/// </summary>
|
||||
public string DishesName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 单价
|
||||
/// </summary>
|
||||
public decimal Price { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 单位
|
||||
/// </summary>
|
||||
public string Unit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数量
|
||||
/// </summary>
|
||||
public int Num { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 金额
|
||||
/// </summary>
|
||||
public decimal Amount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 订单明细状态
|
||||
/// </summary>
|
||||
public OrderDetailsStatusEnumType OrderStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 订单明细状态CN
|
||||
/// </summary>
|
||||
public string OrderStatusCN => OrderStatus.GetDescription();
|
||||
}
|
||||
@@ -172,7 +172,7 @@ public class OrderService : IOrderService
|
||||
var balanceRecord = order.Adapt<BalanceRecordEntity>();
|
||||
await _dbContext.InsertAsync(balanceRecord);
|
||||
|
||||
await _dbContext.InsertAsync(new OrderDetailEntity
|
||||
await _dbContext.InsertAsync(new CanteenOrderDetailEntity
|
||||
{
|
||||
OrderNo = order.No,
|
||||
DishesCode = request.DishesCode,
|
||||
|
||||
@@ -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;
|
||||
|
||||
/// <summary>
|
||||
/// 订餐明细表
|
||||
/// </summary>
|
||||
[SugarTable(TableName = "OrderDetail", TableDescription = "订单明细表")]
|
||||
public class OrderDetailEntity : SugarBaseEntity, ITenantId
|
||||
[SugarTable(TableName = "CanteenOrderDetail", TableDescription = "订单明细表")]
|
||||
public class CanteenOrderDetailEntity : SugarBaseEntity, ITenantId
|
||||
{
|
||||
/// <summary>
|
||||
/// 订单号
|
||||
@@ -42,13 +40,5 @@ public class OrderDetailEntity : SugarBaseEntity, ITenantId
|
||||
[SugarColumn(ColumnDescription = "单位")]
|
||||
public string Unit { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 订单明细状态
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "状态")]
|
||||
public OrderDetailsStatusEnumType Status { get; set; }
|
||||
|
||||
|
||||
public string TenantId { get; set; }
|
||||
}
|
||||
@@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// 有效
|
||||
/// </summary>
|
||||
[Description("有效")]
|
||||
I = 1,
|
||||
|
||||
/// <summary>
|
||||
/// 取消
|
||||
/// </summary>
|
||||
[Description("取消")]
|
||||
C = 2,
|
||||
|
||||
/// <summary>
|
||||
/// 退单
|
||||
/// </summary>
|
||||
[Description("退单")]
|
||||
X = 3,
|
||||
|
||||
/// <summary>
|
||||
/// 免单
|
||||
/// </summary>
|
||||
[Description("免单")]
|
||||
Z = 4,
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace Dlhis.Entity.Canteen.Enums
|
||||
{
|
||||
/// <summary>
|
||||
/// 订单明细状态 OrderDetailsStatusEnumType
|
||||
/// </summary>
|
||||
[Description("订单明细状态")]
|
||||
public enum OrderDetailsStatusEnumType
|
||||
{
|
||||
/// <summary>
|
||||
/// 有效
|
||||
/// </summary>
|
||||
[Description("有效")]
|
||||
I = 1,
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user