调整数据库结构,实现消息模板管理
This commit is contained in:
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
|
||||
/// <summary>
|
||||
/// 地区(国家、省、市、区)
|
||||
/// </summary>
|
||||
[Table("Areas")]
|
||||
public class Area
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
|
||||
/// <summary>
|
||||
/// 分类
|
||||
/// </summary>
|
||||
[Table("Categories")]
|
||||
public class Category
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
@@ -3,7 +3,8 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Atomx.Common.Entities
|
||||
{
|
||||
public class PaymentChannel
|
||||
[Table("Channels")]
|
||||
public class Channel
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据ID
|
||||
@@ -13,26 +14,31 @@ namespace Atomx.Common.Entities
|
||||
public int Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 付款方式,银行、微信、支付宝,USDT
|
||||
/// 站点ID
|
||||
/// </summary>
|
||||
public long SiteId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 通道类型,例如通知、支付、登录等
|
||||
/// </summary>
|
||||
public int Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 支付网络,区块链-TRC20,Online-Wechat,Bank-ICBC
|
||||
/// 通道网络,例如API、SMS、Email,MQTT,区块链网络等
|
||||
/// </summary>
|
||||
public int Network { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 支付渠道名称
|
||||
/// 通道名称
|
||||
/// </summary>
|
||||
[Column(TypeName = "varchar(20)")]
|
||||
public string Name { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 支付渠道标题名称
|
||||
/// 通道标题名称
|
||||
/// </summary>
|
||||
[Column(TypeName = "varchar(20)")]
|
||||
public string Title { get; set; }=string.Empty;
|
||||
public string Title { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 描述说明
|
||||
@@ -40,15 +46,8 @@ namespace Atomx.Common.Entities
|
||||
[Column(TypeName = "varchar(512)")]
|
||||
public string Description { get; set; } = string.Empty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 收款账号
|
||||
/// </summary>
|
||||
[Column(TypeName = "varchar(256)")]
|
||||
public string Account { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 支付通道的设置
|
||||
/// 通道的设置
|
||||
/// </summary>
|
||||
[Column(TypeName = "text")]
|
||||
public string Config { get; set; } = string.Empty;
|
||||
@@ -1,35 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Atomx.Common.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 企业供应商关系
|
||||
/// </summary>
|
||||
[Table("CorporationManufacturerRelations")]
|
||||
public class CorporationManufacturerRelation
|
||||
{
|
||||
/// <summary>
|
||||
/// 产品属性关联数据ID
|
||||
/// </summary>
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.None)]
|
||||
[Key]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 企业ID
|
||||
/// </summary>
|
||||
public long CorporationId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 供应制造商ID
|
||||
/// </summary>
|
||||
public long ManufacturerId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime CreateTime { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Atomx.Common.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 用户公司关系
|
||||
/// </summary>
|
||||
[Table("CorporationUserRelations")]
|
||||
public class CorporationUserRelation
|
||||
{
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.None)]
|
||||
[Key]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 公司ID
|
||||
/// </summary>
|
||||
public long CorporationId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 用户ID
|
||||
/// </summary>
|
||||
public long UserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数据状态
|
||||
/// </summary>
|
||||
public int Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数据创建时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime CreateTime { get; set; } = DateTime.UtcNow;
|
||||
|
||||
/// <summary>
|
||||
/// 数据更新时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
|
||||
/// <summary>
|
||||
/// 货币信息
|
||||
/// </summary>
|
||||
[Table("Currencies")]
|
||||
public class Currency
|
||||
{
|
||||
/// <summary>
|
||||
@@ -15,6 +16,11 @@ namespace Atomx.Common.Entities
|
||||
[Key]
|
||||
public int Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 站点ID
|
||||
/// </summary>
|
||||
public long SiteId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 货币名称,系统
|
||||
/// </summary>
|
||||
|
||||
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
|
||||
/// <summary>
|
||||
/// 货币与支付通道关联表
|
||||
/// </summary>
|
||||
[Table("CurrencyChannelRelations")]
|
||||
public class CurrencyChannelRelation
|
||||
{
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.None)]
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Atomx.Common.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 物料原料类型数据
|
||||
/// </summary>
|
||||
[Table("Materials")]
|
||||
public class Material
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据ID
|
||||
/// </summary>
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.None)]
|
||||
[Key]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料类型
|
||||
/// </summary>
|
||||
public int Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料归属公司ID
|
||||
/// </summary>
|
||||
public long CorporationId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料归属店铺网点ID
|
||||
/// </summary>
|
||||
public long StoreId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料数量
|
||||
/// </summary>
|
||||
public decimal Quantity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数据最后更新时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Atomx.Common.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 原料采购批次
|
||||
/// </summary>
|
||||
[Table("MaterialBatchs")]
|
||||
public class MaterialBatch
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据ID
|
||||
/// </summary>
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.None)]
|
||||
[Key]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 类型:采购、借调、借调归还
|
||||
/// </summary>
|
||||
public int Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料数据ID
|
||||
/// </summary>
|
||||
public long MaterialId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料归属公司ID
|
||||
/// </summary>
|
||||
public long CorporationId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料归属店铺网点ID
|
||||
/// </summary>
|
||||
public long StoreId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料当前数量
|
||||
/// </summary>
|
||||
public decimal Quantity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料批次总量
|
||||
/// </summary>
|
||||
public decimal TotalQuantity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料采购价格
|
||||
/// </summary>
|
||||
public decimal Price { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数据创建时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime CreateTime { get; set; } = DateTime.UtcNow;
|
||||
|
||||
/// <summary>
|
||||
/// 数据最后更新时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Atomx.Common.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 原料详细记录,采购入库、使用出库、借调、归还、盘点校对
|
||||
/// </summary>
|
||||
[Table("MaterialRecords")]
|
||||
public class MaterialRecord
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据ID
|
||||
/// </summary>
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.None)]
|
||||
[Key]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 操作类型,采购入库、使用出库、借调出库、归还入库、盘点校对
|
||||
/// </summary>
|
||||
public int Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料Id
|
||||
/// </summary>
|
||||
public long MaterialId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 归属原料批次ID
|
||||
/// </summary>
|
||||
public long MaterialBatchId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 归属公司id
|
||||
/// </summary>
|
||||
public long CorporationId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数据店铺网点id
|
||||
/// </summary>
|
||||
public long StoreId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 操作用户ID
|
||||
/// </summary>
|
||||
public long UserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原料价格
|
||||
/// </summary>
|
||||
public decimal Price { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数量
|
||||
/// </summary>
|
||||
public decimal Quantity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 使用原料产生的费用
|
||||
/// </summary>
|
||||
public decimal Expenses { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 标记
|
||||
/// </summary>
|
||||
public int Mark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注说明
|
||||
/// </summary>
|
||||
[Column(TypeName = "varchar(256)")]
|
||||
public string Note { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 注册数据创建时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime CreateTime { get; set; } = DateTime.UtcNow;
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,11 @@ namespace Atomx.Common.Entities
|
||||
[Key]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 站点ID
|
||||
/// </summary>
|
||||
public long SiteId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 语言编码
|
||||
/// </summary>
|
||||
@@ -50,6 +55,12 @@ namespace Atomx.Common.Entities
|
||||
[Column(TypeName = "text")]
|
||||
public string Body { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 附件文件地址列表,多个附件以逗号分隔
|
||||
/// </summary>
|
||||
[Column(TypeName = "varchar(1024)")]
|
||||
public string Attachments { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 是否可用
|
||||
/// </summary>
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Atomx.Common.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 价格走势
|
||||
/// </summary>
|
||||
[Table("PriceTrends")]
|
||||
public class PriceTrend
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据ID
|
||||
/// </summary>
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.None)]
|
||||
[Key]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 日期
|
||||
/// </summary>
|
||||
public int Date { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 类型
|
||||
/// </summary>
|
||||
public int Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 当前价格
|
||||
/// </summary>
|
||||
public decimal Price { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最低价格
|
||||
/// </summary>
|
||||
public decimal LowestPrice { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最高价格
|
||||
/// </summary>
|
||||
public decimal HighestPrice { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 当前零售价格
|
||||
/// </summary>
|
||||
public decimal RetailPrice { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最低零售价格
|
||||
/// </summary>
|
||||
public decimal LowestRetailPrice { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最高零售价格
|
||||
/// </summary>
|
||||
public decimal HighestRetailPrice { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -22,13 +22,7 @@ namespace Atomx.Common.Entities
|
||||
public long SiteId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统设置KEY
|
||||
/// </summary>
|
||||
[Column(TypeName = "varchar(64)")]
|
||||
public string Key { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 配置类型,0 系统设置,
|
||||
/// 配置类型,见 SettingType 枚举
|
||||
/// </summary>
|
||||
public int Type { get; set; }
|
||||
|
||||
@@ -38,6 +32,12 @@ namespace Atomx.Common.Entities
|
||||
[Column(TypeName = "varchar(64)")]
|
||||
public string Name { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 系统设置KEY
|
||||
/// </summary>
|
||||
[Column(TypeName = "varchar(64)")]
|
||||
public string Key { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 系统设置项
|
||||
/// </summary>
|
||||
|
||||
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
|
||||
/// <summary>
|
||||
/// 站点应用
|
||||
/// </summary>
|
||||
[Table("SiteApps")]
|
||||
public class SiteApp
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Atomx.Common.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 出入库记录
|
||||
/// </summary>
|
||||
[Table("WarehouseStockRecords")]
|
||||
public class WarehouseStockRecord
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据ID
|
||||
/// </summary>
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.None)]
|
||||
[Key]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 类型,0入库,1出库,初始
|
||||
/// </summary>
|
||||
public int? Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 产生动作的用户ID
|
||||
/// </summary>
|
||||
public long? Operator { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注说明
|
||||
/// </summary>
|
||||
[Column(TypeName = "varchar(256)")]
|
||||
public string Note { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 注册数据创建时间
|
||||
/// </summary>
|
||||
[Column(TypeName = "timestamptz")]
|
||||
public DateTime CreateTime { get; set; } = DateTime.UtcNow;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user