调整地区实体

Atomx.Common/Entities/Area.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace Atomx.Common.Entities
 {
     /// <summary>
-    /// 地区（国家、省、市、区）
+    /// 地区（市、区）
     /// </summary>
     [Table("Areas")]
     public class Area
@@ -16,6 +16,16 @@ namespace Atomx.Common.Entities
         [Key]
         public long Id { get; set; }
 
+        /// <summary>
+        /// 国家ID
+        /// </summary>
+        public long CountryId { get; set; }
+
+        /// <summary>
+        /// 州省ID
+        /// </summary>
+        public long StateProvinceId { get; set; }
+
         /// <summary>
         /// 上级ID
         /// </summary>
@@ -34,23 +44,6 @@ namespace Atomx.Common.Entities
         [Column(TypeName = "varchar(1)")]
         public string Initial { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 双字母代码
-        /// </summary>
-        [Column(TypeName = "varchar(2)")]
-        public string TwoLetterISOCode { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 三字母代码
-        /// </summary>
-        [Column(TypeName = "varchar(3)")]
-        public string ThreeLetterISOCode { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 数字代码
-        /// </summary>
-        public int NumericISOCode { get; set; }
-
         /// <summary>
         /// 是否允许配送
         /// </summary>

Atomx.Common/Entities/Channel.cs

@@ -9,7 +9,7 @@ namespace Atomx.Common.Entities
         /// <summary>
         /// 数据ID
         /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         [Key]
         public int Id { get; set; }
 

Atomx.Common/Entities/Country.cs

@@ -0,0 +1,64 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Atomx.Common.Entities
+{
+    /// <summary>
+    /// 国家数据
+    /// </summary>
+    [Table("Countries")]
+    public class Country
+    {
+        /// <summary>
+        /// 数据ID
+        /// </summary>
+        [DatabaseGenerated(DatabaseGeneratedOption.None)]
+        [Key]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 地区名称
+        /// </summary>
+
+        [Column(TypeName = "varchar(256)")]
+        public string Name { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 首字母
+        /// </summary>
+        [Column(TypeName = "varchar(1)")]
+        public string Initial { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 双字母代码
+        /// </summary>
+        [Column(TypeName = "varchar(2)")]
+        public string TwoLetterISOCode { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 三字母代码
+        /// </summary>
+        [Column(TypeName = "varchar(3)")]
+        public string ThreeLetterISOCode { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 数字代码
+        /// </summary>
+        public int NumericISOCode { get; set; }
+
+        /// <summary>
+        /// 是否允许配送
+        /// </summary>
+        public bool AllowShipping { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool Enabled { get; set; }
+
+        /// <summary>
+        /// 显示排序
+        /// </summary>
+        public int DisplayOrder { get; set; }
+    }
+}

Atomx.Common/Entities/CurrencyChannelRelation.cs

@@ -26,7 +26,7 @@ namespace Atomx.Common.Entities
         /// <summary>
         /// 支付通道ID
         /// </summary>
-        public int PayChannelId { get; set; }
+        public int ChannelId { get; set; }
 
         /// <summary>
         /// 每天可用开始时间

Atomx.Common/Entities/LocalizedProperty.cs

@@ -19,7 +19,7 @@ namespace Atomx.Common.Entities
         /// <summary>
         /// 语言编码
         /// </summary>
-        public int LanguageNumber { get; set; }
+        public int LanguageId { get; set; }
 
         /// <summary>
         /// 数据类型

Atomx.Common/Entities/Post.cs

@@ -13,8 +13,16 @@ namespace Atomx.Common.Entities
         [Key]
         public long Id { get; set; }
 
+        /// <summary>
+        /// 内容类型
+        /// </summary>
         public int Type { get; set; }
 
+        /// <summary>
+        /// 语言编码
+        /// </summary>
+        public int LanguageId { get; set; }
+
         /// <summary>
         /// 作者ID
         /// </summary>

Atomx.Common/Entities/StateProvince.cs

@@ -0,0 +1,53 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Atomx.Common.Entities
+{
+    /// <summary>
+    /// 州省
+    /// </summary>
+    [Table("StateProvinces")]
+    public class StateProvince
+    {
+        /// <summary>
+        /// 数据ID
+        /// </summary>
+        [DatabaseGenerated(DatabaseGeneratedOption.None)]
+        [Key]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 地区名称
+        /// </summary>
+
+        [Column(TypeName = "varchar(256)")]
+        public string Name { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 国家ID
+        /// </summary>
+        public long CountryId { get; set; }
+
+        /// <summary>
+        /// 首字母
+        /// </summary>
+        [Column(TypeName = "varchar(1)")]
+        public string Initial { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 缩写
+        /// </summary>
+        [Column(TypeName = "varchar(32)")]
+        public string Abbreviation { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool Enabled { get; set; }
+
+        /// <summary>
+        /// 显示排序
+        /// </summary>
+        public int DisplayOrder { get; set; }
+    }
+}