fix 优化菜品保存和分页

Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs

@@ -139,5 +139,12 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
     [SugarColumn(ColumnDescription = "备注")]
     public string Remark { get; set; }
 
+    /// <summary>
+    /// 餐饮应用类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "餐饮应用类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public CanteenApplicaitonTypeEnumType ApplicationType { get; set; }
+
+
     public string TenantId { get; set; }
 }

Src/Dlhis.Entity/Canteen/Entities/DishesEntity.cs

@@ -9,7 +9,7 @@ namespace Dlhis.Entity.Canteen.Entities;
 /// 菜品表
 /// </summary>
 [SugarTable(TableName = "Dishes", TableDescription = "菜品表")]
-public class DishesEntity : SugarBaseEntity, ITenantId
+public class DishesEntity : SugarBaseEntity, IImageUrl, ITenantId
 {
     /// <summary>
     /// 分类
@@ -20,6 +20,7 @@ public class DishesEntity : SugarBaseEntity, ITenantId
     /// <summary>
     /// 营业点
     /// </summary>
+    [SugarColumn(ColumnDescription = "营业点", IsNullable = false)]
     public Guid BusinessPlaceCode { get; set; }
 
     /// <summary>
@@ -47,6 +48,12 @@ public class DishesEntity : SugarBaseEntity, ITenantId
     [SugarColumn(ColumnDescription = "单价")]
     public decimal Price { get; set; }
 
+    /// <summary>
+    /// 单位
+    /// </summary>
+    [SugarColumn(ColumnDescription = "单位", IsJson = true, DefaultValue = "[]")]
+    public List<string> Units { get; set; }
+
     /// <summary>
     /// 图片
     /// </summary>

Src/Dlhis.Entity/Canteen/Entities/DishesMenuEntity.cs

@@ -22,7 +22,7 @@ public class DishesMenuEntity : SugarBaseEntity, ITenantId, IVersion
     /// 菜单类型
     /// </summary>
     [SugarColumn(SqlParameterDbType = typeof(EnumToStringConvert))]
-    public CanteenMenuEnumType Type { get; set; }
+    public CanteenApplicaitonTypeEnumType Type { get; set; }
 
     /// <summary>
     /// 所属营业点

Src/Dlhis.Entity/Canteen/Enums/CanteenApplicaitonTypeEnumType.cs

@@ -3,26 +3,23 @@
 namespace Dlhis.Entity.Canteen.Enums;
 
 /// <summary>
-/// 菜品类型 CanteenMenuEnumType
+/// 餐饮应用类型
 /// </summary>
-[Description("菜品类型")]
-public enum CanteenMenuEnumType
+[Description("餐饮应用类型")]
+public enum CanteenApplicaitonTypeEnumType
 {
+    [Description("设备消费")]
+    Device = 100,
+
     /// <summary>
     /// 订餐
     /// </summary>
     [Description("订餐")]
-    Booking = 1,
+    Booking = 200,
 
     /// <summary>
     /// 扫码点餐
     /// </summary>
     [Description("扫码点餐")]
-    QrCode=2,
-
-    /// <summary>
-    /// 通用
-    /// </summary>
-    [Description("通用")]
-    General = 3,
+    QrCode = 300,
 }

Src/Dlhis.Entity/Canteen/Enums/CanteenOrderStatusEnumType.cs

@@ -20,6 +20,11 @@ public enum CanteenOrderStatusEnumType
     [Description("成功")]
     Successful = 1,
 
+    /// <summary>
+    /// 取消
+    /// </summary>
+    [Description("取消")]
+    Cancel = 95,
 
     /// <summary>
     /// 失败

Src/Dlhis.Entity/IImageUrl.cs

@@ -0,0 +1,6 @@
+namespace Dlhis.Entity;
+
+public interface IImageUrl
+{
+    public string ImageUrl { get; set; }
+}