# 2022-02-11

### 1.3.5 开源社区版（会员专业版同步修改）：
无
### 0.1.6 会员专业版：
【新增】后台【平台设置-订单管理】增加【佣金计算通道】功能，分为【仅代理】【仅分销】【先代理后分销】【先分销后代理】四种自选模式。
【新增】增加【CoreCmsAgentOrderDetails】表，实现代理佣金订单详情列表功能，精确到具体商品明细。
【新增】增加【CoreCmsDistributionOrderDetails】表，实现三级佣金订单详情列表功能，精确到具体商品明细。
【修复】修复代理商商铺开启按钮错用三级分销商店铺开关功能，增加代理商商铺开启开关。
【修复】修复代理商佣金明细日期选择范围错乱问题。
【优化】uniapp自带progress进度条更换为uview2.x进度条。
【优化】敏感词过滤组件启用废弃的【WordsMatch】方法，启用【StringSearch】方法替代。

CoreCms.Net.Model/Entities/Agent/CoreCmsAgentOrderDetails.cs

@@ -0,0 +1,200 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2022/2/10 1:27:28
+ *        Description: 暂无
+ ***********************************************************************/
+
+using SqlSugar;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    /// 代理佣金明细
+    /// </summary>
+    public partial class CoreCmsAgentOrderDetails
+    {
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public CoreCmsAgentOrderDetails()
+        {
+        }
+		
+        /// <summary>
+        /// 序列
+        /// </summary>
+        [Display(Name = "序列")]
+		
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 id  { get; set; }
+        
+		
+        /// <summary>
+        /// 代理商佣金订单
+        /// </summary>
+        [Display(Name = "代理商佣金订单")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 agentOrderId  { get; set; }
+        
+		
+        /// <summary>
+        /// 用户订单编号
+        /// </summary>
+        [Display(Name = "用户订单编号")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String orderId  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品单价
+        /// </summary>
+        [Display(Name = "货品单价")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Decimal productPrice  { get; set; }
+        
+		
+        /// <summary>
+        /// 结算佣金
+        /// </summary>
+        [Display(Name = "结算佣金")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Decimal amount  { get; set; }
+        
+		
+        /// <summary>
+        /// 商品序列
+        /// </summary>
+        [Display(Name = "商品序列")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 goodId  { get; set; }
+        
+		
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        [Display(Name = "商品名称")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:200,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String name  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品明细序列号存储
+        /// </summary>
+        [Display(Name = "货品明细序列号存储")]
+		
+        
+        
+        
+        
+        public System.String addon  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品序列
+        /// </summary>
+        [Display(Name = "货品序列")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 productId  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品数量
+        /// </summary>
+        [Display(Name = "货品数量")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 productNums  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品优惠总金额
+        /// </summary>
+        [Display(Name = "货品优惠总金额")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Decimal promotionAmount  { get; set; }
+        
+		
+        /// <summary>
+        /// 图片
+        /// </summary>
+        [Display(Name = "图片")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:100,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String imageUrl  { get; set; }
+        
+		
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Display(Name = "备注")]
+		
+        
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String remark  { get; set; }
+        
+		
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Display(Name = "创建时间")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.DateTime createTime  { get; set; }
+        
+		
+    }
+}

CoreCms.Net.Model/Entities/Agent/CoreCmsAgentOrderPartial.cs

@@ -7,6 +7,8 @@
  *         CreateTime: 2021/1/31 21:45:10
  *        Description: 暂无
  ***********************************************************************/
+
+using System.Collections.Generic;
 using SqlSugar;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -26,6 +28,13 @@ namespace CoreCms.Net.Model.Entities
         [SugarColumn(IsIgnore = true)]
         public System.String buyUserNickName { get; set; }
 
+        /// <summary>
+        /// 购买人头像
+        /// </summary>
+        [Display(Name = "购买人头像")]
+        [SugarColumn(IsIgnore = true)]
+        public System.String buyUserAvatar { get; set; }
+
         /// <summary>
         /// 分销商
         /// </summary>
@@ -33,5 +42,26 @@ namespace CoreCms.Net.Model.Entities
         [SugarColumn(IsIgnore = true)]
         public System.String distributorName { get; set; }
 
+        /// <summary>
+        /// 商品总价
+        /// </summary>
+        [Display(Name = "商品总价")]
+        [SugarColumn(IsIgnore = true)]
+        public System.Decimal goodsAmount { get; set; }
+
+        /// <summary>
+        /// 用户支付金额
+        /// </summary>
+        [Display(Name = "用户支付金额")]
+        [SugarColumn(IsIgnore = true)]
+        public System.Decimal payedAmount { get; set; }
+
+        /// <summary>
+        /// 订单详情
+        /// </summary>
+        [Display(Name = "订单详情")]
+        [SugarColumn(IsIgnore = true)]
+        public List<CoreCmsAgentOrderDetails> agentOrderDetails { get; set; }
+
     }
 }

CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderDetails.cs

@@ -0,0 +1,200 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2022/2/11 1:02:23
+ *        Description: 暂无
+ ***********************************************************************/
+
+using SqlSugar;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    /// 分销佣金明细
+    /// </summary>
+    public partial class CoreCmsDistributionOrderDetails
+    {
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public CoreCmsDistributionOrderDetails()
+        {
+        }
+		
+        /// <summary>
+        /// 序列
+        /// </summary>
+        [Display(Name = "序列")]
+		
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 id  { get; set; }
+        
+		
+        /// <summary>
+        /// 代理商佣金订单
+        /// </summary>
+        [Display(Name = "代理商佣金订单")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 distributionOrderId  { get; set; }
+        
+		
+        /// <summary>
+        /// 用户订单编号
+        /// </summary>
+        [Display(Name = "用户订单编号")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String orderId  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品单价
+        /// </summary>
+        [Display(Name = "货品单价")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Decimal productPrice  { get; set; }
+        
+		
+        /// <summary>
+        /// 结算金额
+        /// </summary>
+        [Display(Name = "结算金额")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Decimal amount  { get; set; }
+        
+		
+        /// <summary>
+        /// 商品序列
+        /// </summary>
+        [Display(Name = "商品序列")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 goodId  { get; set; }
+        
+		
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        [Display(Name = "商品名称")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:200,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String name  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品明细序列号存储
+        /// </summary>
+        [Display(Name = "货品明细序列号存储")]
+		
+        
+        
+        
+        
+        public System.String addon  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品序列
+        /// </summary>
+        [Display(Name = "货品序列")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 productId  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品数量
+        /// </summary>
+        [Display(Name = "货品数量")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 productNums  { get; set; }
+        
+		
+        /// <summary>
+        /// 货品优惠总金额
+        /// </summary>
+        [Display(Name = "货品优惠总金额")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Decimal promotionAmount  { get; set; }
+        
+		
+        /// <summary>
+        /// 图片
+        /// </summary>
+        [Display(Name = "图片")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:100,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String imageUrl  { get; set; }
+        
+		
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Display(Name = "备注")]
+		
+        
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String remark  { get; set; }
+        
+		
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Display(Name = "创建时间")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.DateTime createTime  { get; set; }
+        
+		
+    }
+}

CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs

@@ -8,6 +8,7 @@
  *        Description: 暂无
  ***********************************************************************/
 
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using SqlSugar;
 
@@ -25,11 +26,44 @@ namespace CoreCms.Net.Model.Entities
         [SugarColumn(IsIgnore = true)]
         public string buyUserNickName { get; set; }
 
+
+        /// <summary>
+        /// 购买人头像
+        /// </summary>
+        [Display(Name = "购买人头像")]
+        [SugarColumn(IsIgnore = true)]
+        public System.String buyUserAvatar { get; set; }
+
+
         /// <summary>
         ///     分销商
         /// </summary>
         [Display(Name = "分销商")]
         [SugarColumn(IsIgnore = true)]
         public string distributorName { get; set; }
+
+
+        /// <summary>
+        /// 商品总价
+        /// </summary>
+        [Display(Name = "商品总价")]
+        [SugarColumn(IsIgnore = true)]
+        public System.Decimal goodsAmount { get; set; }
+
+        /// <summary>
+        /// 用户支付金额
+        /// </summary>
+        [Display(Name = "用户支付金额")]
+        [SugarColumn(IsIgnore = true)]
+        public System.Decimal payedAmount { get; set; }
+
+        /// <summary>
+        /// 订单详情
+        /// </summary>
+        [Display(Name = "订单详情")]
+        [SugarColumn(IsIgnore = true)]
+        public List<CoreCmsDistributionOrderDetails> distributionOrderDetails { get; set; }
+
+
     }
 }