新增订单表+枚举

Mall.Common/Enum/Goods/OrderDeliveryMethodEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.Goods
+{
+    /// <summary>
+    /// 订单配送方式枚举
+    /// </summary>
+    public enum OrderDeliveryMethodEnum
+    {
+        /// <summary>
+        /// 快递配送
+        /// </summary>
+        [EnumField("快递配送")]
+        ExpressDistribution = 1,
+        /// <summary>
+        /// 到店核销
+        /// </summary>
+        [EnumField("到店核销")]
+        VerificationShop = 2,
+        /// <summary>
+        /// 同城配送
+        /// </summary>
+        [EnumField("同城配送")]
+        CityDistribution = 3
+    }
+}

Mall.Common/Enum/Goods/OrderPaymentTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.Goods
+{
+    /// <summary>
+    /// 订单支付类型枚举
+    /// </summary>
+    public enum OrderPaymentTypeEnum
+    {
+        /// <summary>
+        /// 在线支付
+        /// </summary>
+        [EnumField("在线支付")]
+        OnlinePayment = 1,
+        /// <summary>
+        /// 线下支付
+        /// </summary>
+        [EnumField("线下支付")]
+        OfflinePayment = 2
+    }
+}

Mall.Common/Enum/Goods/OrderStatusEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.Goods
+{
+    /// <summary>
+    /// 订单状态枚举
+    /// </summary>
+    public enum OrderStatusEnum
+    {
+        /// <summary>
+        /// 未付款
+        /// </summary>
+        [EnumField("未付款")]
+        NonPayment = 1,
+        /// <summary>
+        /// 待发货
+        /// </summary>
+        [EnumField("待发货")]
+        WaitSendGoods = 2,
+        /// <summary>
+        /// 待收货
+        /// </summary>
+        [EnumField("待收货")]
+        WaitReceiving = 3,
+        /// <summary>
+        /// 已收货
+        /// </summary>
+        [EnumField("已收货")]
+        Received = 4,
+        /// <summary>
+        /// 已完成
+        /// </summary>
+        [EnumField("已完成")]
+        Completed = 5,
+        /// <summary>
+        /// 待处理
+        /// </summary>
+        [EnumField("待处理")]
+        WaitDeal = 6,
+        /// <summary>
+        /// 已取消
+        /// </summary>
+        [EnumField("已取消")]
+        Cancel = 7
+    }
+}

Mall.Common/Enum/Goods/OrderTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.Goods
+{
+    /// <summary>
+    /// 订单类型枚举
+    /// </summary>
+    public enum OrderTypeEnum
+    {
+        /// <summary>
+        /// 商场
+        /// </summary>
+        [EnumField("商场")]
+        Mall = 1,
+        /// <summary>
+        /// 砍价
+        /// </summary>
+        [EnumField("砍价")]
+        CutPrice = 2,
+        /// <summary>
+        /// 预约
+        /// </summary>
+        [EnumField("预约")]
+        Reservation = 3,
+        /// <summary>
+        /// 拼团
+        /// </summary>
+        [EnumField("拼团")]
+        GroupBooking = 4,
+        /// <summary>
+        /// 刮刮卡
+        /// </summary>
+        [EnumField("刮刮卡")]
+        ScratchCard = 5,
+        /// <summary>
+        /// 幸运抽奖
+        /// </summary>
+        [EnumField("幸运抽奖")]
+        LuckyDraw = 6,
+        /// <summary>
+        /// 积分商城
+        /// </summary>
+        [EnumField("积分商城")]
+        Integral = 7,
+        /// <summary>
+        /// 当面付
+        /// </summary>
+        [EnumField("当面付")]
+        InPersonToPay = 8,
+        /// <summary>
+        /// 超级会员卡
+        /// </summary>
+        [EnumField("超级会员卡")]
+        SuperCard = 9,
+        /// <summary>
+        /// 商品预售
+        /// </summary>
+        [EnumField("商品预售")]
+        GoodsToBooking = 10
+    }
+}

Mall.Common/Mall.Common.csproj

-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>

Mall.Model/Entity/Product/RB_Goods_Log.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品订单日志信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Log
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 来源id
+        /// </summary>        
+        public int? SourceId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 来源类型  1订单  2商品
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作内容
+        /// </summary>        
+        public string Content
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_Order.cs

 using Mall.Common.AOP;
+using Mall.Common.Enum.Goods;
 using Mall.Common.Enum.User;
 using System;
 using System.Collections.Generic;
@@ -49,7 +50,7 @@ namespace Mall.Model.Entity.Product
         /// <summary>
         /// 订单来源（平台）  枚举
         /// </summary>        
-        public int? OrderSource
+        public UserSourceEnum? OrderSource
         {
             get;
             set;
@@ -57,7 +58,7 @@ namespace Mall.Model.Entity.Product
         /// <summary>
         /// 订单类型  枚举
         /// </summary>        
-        public int? OrderType
+        public OrderTypeEnum? OrderType
         {
             get;
             set;
@@ -65,7 +66,7 @@ namespace Mall.Model.Entity.Product
         /// <summary>
         /// 支付方式   枚举
         /// </summary>        
-        public int? PaymentWay
+        public OrderPaymentTypeEnum? PaymentWay
         {
             get;
             set;
@@ -97,7 +98,7 @@ namespace Mall.Model.Entity.Product
         /// <summary>
         /// 配送方式
         /// </summary>        
-        public int? DeliveryMethod
+        public OrderDeliveryMethodEnum? DeliveryMethod
         {
             get;
             set;
@@ -209,7 +210,7 @@ namespace Mall.Model.Entity.Product
         /// <summary>
         /// 订单状态  枚举
         /// </summary>        
-        public int? OrderStatus
+        public OrderStatusEnum? OrderStatus
         {
             get;
             set;

Mall.Model/Entity/Product/RB_Goods_OrderCommission.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品订单返佣信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderCommission
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单id
+        /// </summary>        
+        public int? OrderId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分销商id
+        /// </summary>        
+        public int? UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 等级  一级分销   二级分销 （跟下线正好相反）  0表示自购返佣
+        /// </summary>        
+        public int? Grade
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 佣金
+        /// </summary>        
+        public decimal? Commission
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否是商品设置分销反佣   1是  2否
+        /// </summary>        
+        public int? IsGoodsDistribution
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 佣金状态  1待返佣   2已返佣  
+        /// </summary>        
+        public int? CommissionState
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// Remark
+        /// </summary>        
+        public string Remark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_ExpressRelevance_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品订单快递关联表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_ExpressRelevance_Extend : RB_Goods_ExpressRelevance
+    {
+        
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Log_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品订单日志表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Log_Extend : RB_Goods_Log
+    {
+        
+    }
+}

Mall.Model/Extend/Product/RB_Goods_OrderCommission_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品订单返佣表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderCommission_Extend : RB_Goods_OrderCommission
+    {
+        
+    }
+}

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品订单明细表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderDetail_Extend : RB_Goods_OrderDetail
+    {
+        
+    }
+}

Mall.Model/Extend/Product/RB_Goods_OrderExpress_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品订单快递表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderExpress_Extend : RB_Goods_OrderExpress
+    {
+        
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品订单表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Order_Extend : RB_Goods_Order
+    {
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+    }
+}