yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 提交可编译版本

Browse Source
This commit is contained in:
liguoyang
2024-03-18 11:03:43 +08:00
parent 8f430bccd3
commit c825531fda
55 changed files with 629 additions and 1476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs
View File

@@ -1,114 +0,0 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.Core.DataAccess.Entity;
using Kurisu.SqlSugar;
using SqlSugar;
using SqlSugar.DbConvert;
namespace Dlhis.Entity.Canteen.Entities
{
/// <summary>
/// 小程序订单表
/// </summary>
[SugarTable(TableName = "MiniProgramOrder", TableDescription = "小程序订单表")]
public class MiniProgramOrderEntity : SugarBaseEntity, ITenantId
{
/// <summary>
/// 订单号
/// </summary>
[SugarColumn(ColumnDescription = "订单号")]
public string No { get; set; }
/// <summary>
/// 姓名
/// </summary>
[SugarColumn(ColumnDescription = "姓名")]
public string Name { get; set; }
/// <summary>
/// 工号
/// </summary>
[SugarColumn(ColumnDescription = "工号")]
public string Code { get; set; }
/// <summary>
/// 人事范围
/// </summary>
[SugarColumn(ColumnDescription = "人事范围")]
public string Werks { get; set; }
/// <summary>
/// 部门编码
/// </summary>
[SugarColumn(ColumnDescription = "部门编码")]
public string DepartmentNo { get; set; }
/// <summary>
/// 成本中心
/// </summary>
[SugarColumn(ColumnDescription = "成本中心")]
public string CostId { get; set; }
/// <summary>
/// 工作地
/// </summary>
[SugarColumn(ColumnDescription = "工作地")]
public string Workplace { get; set; }
/// <summary>
/// 厂区
/// </summary>
[SugarColumn(ColumnDescription = "厂区")]
public string Factory { get; set; }
/// <summary>
/// 营业点
/// </summary>
[SugarColumn(ColumnDescription = "营业点")]
public Guid PlaceCode { get; set; }
/// <summary>
/// 餐次
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "餐次")]
public ShiftEnumType ShiftType { get; set; }
/// <summary>
/// 手机号码
/// </summary>
[SugarColumn(ColumnDescription = "手机号码")]
public string Phone { get; set; }
/// <summary>
/// 用餐日期
/// </summary>
[SugarColumn(ColumnDescription = "用餐日期", IsNullable = true)]
public DateTime UseDate { get; set; }
/// <summary>
/// 支付方式
/// </summary>
[SugarColumn(ColumnDescription = "支付方式", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
public BalanceRecordSourceEnumType PayType { get; set; }
/// <summary>
/// 订单状态
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单状态")]
public MiniProgramOrderStatusEnumType OrderStatus { get; set; }
/// <summary>
/// 订单类型
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单类型")]
public CanteenMenuEnumType OrderType { get; set; }
/// <summary>
/// 总金额
/// </summary>
[SugarColumn(ColumnDescription = "金额")]
public decimal Amount { get; set; }
public string TenantId { get; set; }
}
}

7
Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs → Src/Dlhis.Entity/Canteen/Entities/OrderDetailEntity.cs
View File

@@ -9,8 +9,8 @@ namespace Dlhis.Entity.Canteen.Entities;
/// <summary>
/// 订餐明细表
/// </summary>
[SugarTable(TableName = "OrderDetails", TableDescription = "订餐明细表")]
public class OrderDetailsEntity : SugarBaseEntity, ITenantId
[SugarTable(TableName = "OrderDetail", TableDescription = "订单明细表")]
public class OrderDetailEntity : SugarBaseEntity, ITenantId
{
/// <summary>
/// 订单号
@@ -46,8 +46,9 @@ public class OrderDetailsEntity : SugarBaseEntity, ITenantId
/// <summary>
/// 订单明细状态
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单明细状态")]
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "状态")]
public OrderDetailsStatusEnumType Status { get; set; }
public string TenantId { get; set; }
}

9
Src/Dlhis.Entity/Canteen/Enums/OrderDetailsStatusEnumType.cs
View File

@@ -1,14 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.ComponentModel;
namespace Dlhis.Entity.Canteen.Enums
{
/// <summary>
/// 订单明细状态
/// 订单明细状态 OrderDetailsStatusEnumType
/// </summary>
[Description("订单明细状态")]
public enum OrderDetailsStatusEnumType