# 2022-01-17

### 1.3.0 开源社区版：
【新增】完善商品查看详情功能。#I4QTLR
【新增】订单详情页面需要增加下单客户信息。
【新增】完善服务订单管理功能，实现订单作废、导出功能；核销码实现列表，作废，导出功能。#I4OSBK
【修复】修复普通订单查看详情，因优惠信息问题导致的异常情况。#I4QXUQ
【修复】修复门店列表下的用户编辑页面名称大小写问题（linux下大小写敏感问题）。
【修复】修复微信支付成功相应的日志记录类型有误。#I4QSNZ
【修复】修复发货日志记录sku货号错误问题。#I4PX25
【修复】修复发货单列表查看详情，提示权限不足的问题。#I4QDQR

### 0.0.8 会员专业版：
【新增】新增接龙功能营销功能，实现单个活动，可以添加多个不同商品的不同sku混合选择下单。
【新增】增加接龙数据库脚本及演示文件。
【升级】升级uView组件到2.0.20版本。
【修复】修复编辑收货地址的路径中选取区域部分可以手动输入文字。
【修复】修复【微信直播带货】组件缺少获取sku分页数据的问题。#I4QKSU
【优化】调整【微信自定义交易组件】商品类目排序方式及展示内容。#I4QE0N

CoreCms.Net.Model/CoreCms.Net.Model.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="sqlSugarCore" Version="5.0.5.1" />
+    <PackageReference Include="sqlSugarCore" Version="5.0.5.3" />
   </ItemGroup>
 
 </Project>

CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs

@@ -89,6 +89,11 @@ namespace CoreCms.Net.Model.Entities
         [SugarColumn(IsIgnore = true)]
         public CoreCmsProducts product { get; set; } = new();
 
+        /// <summary>
+        ///     关联SKU
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public List<CoreCmsProducts> sku { get; set; } = new();
 
         /// <summary>
         ///     是否收藏

CoreCms.Net.Model/Entities/Service/CoreCmsUserServicesOrder.cs

@@ -3,11 +3,13 @@
  *        ProjectName: 核心内容管理系统                                
  *                Web: https://www.corecms.net                      
  *             Author: 大灰灰                                          
- *              Email: jianweie@163.com
- *         CreateTime: 2021-06-08 22:14:59
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2022/1/15 1:30:57
  *        Description: 暂无
-***********************************************************************/ 
+ ***********************************************************************/
+
 using SqlSugar;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace CoreCms.Net.Model.Entities
@@ -15,84 +17,136 @@ namespace CoreCms.Net.Model.Entities
     /// <summary>
     /// 服务购买表
     /// </summary>
-    [SugarTable("CoreCmsUserServicesOrder",TableDescription = "服务购买表")]
     public partial class CoreCmsUserServicesOrder
     {
         /// <summary>
-        /// 服务购买表
+        /// 构造函数
         /// </summary>
         public CoreCmsUserServicesOrder()
         {
         }
-
+		
         /// <summary>
         /// 序列
         /// </summary>
         [Display(Name = "序列")]
-        [SugarColumn(ColumnDescription = "序列", IsPrimaryKey = true, IsIdentity = true)]
+		
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        
         [Required(ErrorMessage = "请输入{0}")]
-        public System.Int32 id { get; set; }
+        
+        
+        
+        public System.Int32 id  { get; set; }
+        
+		
         /// <summary>
         /// 服务订单编号
         /// </summary>
         [Display(Name = "服务订单编号")]
-        [SugarColumn(ColumnDescription = "服务订单编号")]
+		
         [Required(ErrorMessage = "请输入{0}")]
-        [StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")]
-        public System.String serviceOrderId { get; set; }
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String serviceOrderId  { get; set; }
+        
+		
         /// <summary>
         /// 关联用户
         /// </summary>
         [Display(Name = "关联用户")]
-        [SugarColumn(ColumnDescription = "关联用户")]
+		
         [Required(ErrorMessage = "请输入{0}")]
-        public System.Int32 userId { get; set; }
+        
+        
+        
+        public System.Int32 userId  { get; set; }
+        
+		
         /// <summary>
         /// 关联服务
         /// </summary>
         [Display(Name = "关联服务")]
-        [SugarColumn(ColumnDescription = "关联服务")]
+		
         [Required(ErrorMessage = "请输入{0}")]
-        public System.Int32 servicesId { get; set; }
+        
+        
+        
+        public System.Int32 servicesId  { get; set; }
+        
+		
         /// <summary>
         /// 是否支付
         /// </summary>
         [Display(Name = "是否支付")]
-        [SugarColumn(ColumnDescription = "是否支付")]
+		
         [Required(ErrorMessage = "请输入{0}")]
-        public System.Boolean isPay { get; set; }
+        
+        
+        
+        public System.Boolean isPay  { get; set; }
+        
+		
         /// <summary>
         /// 支付时间
         /// </summary>
         [Display(Name = "支付时间")]
-        [SugarColumn(ColumnDescription = "支付时间", IsNullable = true)]
-        public System.DateTime? payTime { get; set; }
+		
+        
+        
+        
+        
+        public System.DateTime? payTime  { get; set; }
+        
+		
         /// <summary>
         /// 支付单号
         /// </summary>
         [Display(Name = "支付单号")]
-        [SugarColumn(ColumnDescription = "支付单号", IsNullable = true)]
-        [StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")]
-        public System.String paymentId { get; set; }
+		
+        
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String paymentId  { get; set; }
+        
+		
         /// <summary>
         /// 状态
         /// </summary>
         [Display(Name = "状态")]
-        [SugarColumn(ColumnDescription = "状态")]
+		
         [Required(ErrorMessage = "请输入{0}")]
-        public System.Int32 status { get; set; }
+        
+        
+        
+        public System.Int32 status  { get; set; }
+        
+		
         /// <summary>
         /// 订单创建时间
         /// </summary>
         [Display(Name = "订单创建时间")]
-        [SugarColumn(ColumnDescription = "订单创建时间")]
+		
         [Required(ErrorMessage = "请输入{0}")]
-        public System.DateTime createTime { get; set; }
+        
+        
+        
+        public System.DateTime createTime  { get; set; }
+        
+		
         /// <summary>
         /// 截止服务时间
         /// </summary>
         [Display(Name = "截止服务时间")]
-        [SugarColumn(ColumnDescription = "截止服务时间", IsNullable = true)]
-        public System.DateTime? servicesEndTime { get; set; }
+		
+        
+        
+        
+        
+        public System.DateTime? servicesEndTime  { get; set; }
+        
+		
     }
-}
+}

CoreCms.Net.Model/Entities/Service/CoreCmsUserServicesOrderPartial.cs

@@ -32,5 +32,23 @@ namespace CoreCms.Net.Model.Entities
         [Display(Name = "状态说明")]
         [SugarColumn(IsIgnore = true)]
         public string statusStr { get; set; }
+
+
+        /// <summary>
+        ///     服务标题
+        /// </summary>
+        [Display(Name = "服务标题")]
+        [SugarColumn(IsIgnore = true)]
+        public string serviceTitle { get; set; }
+
+
+        /// <summary>
+        ///     用户昵称
+        /// </summary>
+        [Display(Name = "用户昵称")]
+        [SugarColumn(IsIgnore = true)]
+        public string userName { get; set; }
+
+
     }
 }

CoreCms.Net.Model/Entities/Solitaire/CoreCmsSolitaire.cs

@@ -0,0 +1,188 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2021/10/11 22:19:44
+ *        Description: 暂无
+ ***********************************************************************/
+
+using SqlSugar;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    /// 接龙活动表
+    /// </summary>
+    public partial class CoreCmsSolitaire
+    {
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public CoreCmsSolitaire()
+        {
+        }
+		
+        /// <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}")]
+        [StringLength(maximumLength:250,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String title  { get; set; }
+        
+		
+        /// <summary>
+        /// 缩略图
+        /// </summary>
+        [Display(Name = "缩略图")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:250,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String thumbnail  { get; set; }
+        
+		
+        /// <summary>
+        /// 活动描述
+        /// </summary>
+        [Display(Name = "活动描述")]
+		
+        
+        [StringLength(maximumLength:250,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String description  { get; set; }
+        
+		
+        /// <summary>
+        /// 活动内容
+        /// </summary>
+        [Display(Name = "活动内容")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.String contentBody  { get; set; }
+        
+		
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [Display(Name = "开始时间")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.DateTime startTime  { get; set; }
+        
+		
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [Display(Name = "结束时间")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.DateTime endTime  { get; set; }
+        
+		
+        /// <summary>
+        /// 起购价格
+        /// </summary>
+        [Display(Name = "起购价格")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Decimal startBuyPrice  { get; set; }
+        
+		
+        /// <summary>
+        /// 起送价格
+        /// </summary>
+        [Display(Name = "起送价格")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Decimal minDeliveryPrice  { get; set; }
+        
+		
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        [Display(Name = "是否显示")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Boolean isShow  { get; set; }
+        
+		
+        /// <summary>
+        /// 活动状态
+        /// </summary>
+        [Display(Name = "活动状态")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 status  { get; set; }
+        
+		
+        /// <summary>
+        /// 标注删除
+        /// </summary>
+        [Display(Name = "标注删除")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Boolean isDelete  { get; set; }
+        
+		
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Display(Name = "创建时间")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.DateTime createTime  { get; set; }
+        
+		
+    }
+}

CoreCms.Net.Model/Entities/Solitaire/CoreCmsSolitaireItems.cs

@@ -0,0 +1,85 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2021/6/21 1:16:08
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System.ComponentModel.DataAnnotations;
+using SqlSugar;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    ///     接龙活动商品表
+    /// </summary>
+    public partial class CoreCmsSolitaireItems
+    {
+        /// <summary>
+        ///     序列
+        /// </summary>
+        [Display(Name = "序列")]
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        [Required(ErrorMessage = "请输入{0}")]
+        public int id { get; set; }
+
+        /// <summary>
+        ///     接龙序列
+        /// </summary>
+        [Display(Name = "接龙序列")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public int solitaireId { get; set; }
+
+        /// <summary>
+        ///     商品序列
+        /// </summary>
+        [Display(Name = "商品序列")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public int goodId { get; set; }
+
+        /// <summary>
+        ///     货品价格
+        /// </summary>
+        [Display(Name = "货品价格")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public int productId { get; set; }
+
+        /// <summary>
+        ///     接龙价
+        /// </summary>
+        [Display(Name = "接龙价")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public decimal price { get; set; }
+
+        /// <summary>
+        ///     活动库存
+        /// </summary>
+        [Display(Name = "活动库存")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public int activityStock { get; set; }
+
+        /// <summary>
+        ///     每人可买
+        /// </summary>
+        [Display(Name = "每人可买")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public int oneCanBuy { get; set; }
+
+        /// <summary>
+        ///     排序
+        /// </summary>
+        [Display(Name = "排序")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public int sortId { get; set; }
+
+        /// <summary>
+        ///     标注删除
+        /// </summary>
+        [Display(Name = "标注删除")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public bool isDelete { get; set; }
+    }
+}

CoreCms.Net.Model/Entities/Solitaire/CoreCmsSolitaireItemsPartial.cs

@@ -0,0 +1,38 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2021/6/21 1:16:08
+ *        Description: 暂无
+ ***********************************************************************/
+
+using SqlSugar;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    /// 接龙活动商品表
+    /// </summary>
+    public partial class CoreCmsSolitaireItems
+    {
+
+        /// <summary>
+        /// 关联货品
+        /// </summary>
+        [Display(Name = "关联货品")]
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public CoreCmsProducts productObj { get; set; }
+
+        /// <summary>
+        /// 关联商品
+        /// </summary>
+        [Display(Name = "关联商品")]
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public CoreCmsGoods goodObj { get; set; }
+
+    }
+}

CoreCms.Net.Model/Entities/Solitaire/CoreCmsSolitairePartial.cs

@@ -0,0 +1,30 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2021/6/14 23:17:57
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using SqlSugar;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    ///     接龙活动表
+    /// </summary>
+    public partial class CoreCmsSolitaire
+    {
+        /// <summary>
+        ///     货品明细
+        /// </summary>
+        [Display(Name = "货品明细")]
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public List<CoreCmsSolitaireItems> items { get; set; }
+    }
+}