# 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.IRepository/Good/ICoreCmsGoodsRepository.cs

@@ -149,6 +149,23 @@ namespace CoreCms.Net.IRepository
         Task<IPageList<CoreCmsGoods>> QueryAgentGoodsPageAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
             string orderBy = "", int pageIndex = 1, int pageSize = 20, bool blUseNoLock = false);
 
+
+
+        /// <summary>
+        ///     根据条件查询商品及sku分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsGoods>> QueryGoodAndSkuPageAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
+            Expression<Func<CoreCmsGoods, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+
+
         /// <summary>
         ///     获取下拉商品数据
         /// </summary>

CoreCms.Net.IRepository/Service/ICoreCmsUserServicesOrderRepository.cs

@@ -8,7 +8,12 @@
  *        Description: 暂无
  ***********************************************************************/
 
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using SqlSugar;
 
 namespace CoreCms.Net.IRepository
 {
@@ -59,5 +64,22 @@ namespace CoreCms.Net.IRepository
         //new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
+
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        new Task<IPageList<CoreCmsUserServicesOrder>> QueryPageAsync(
+            Expression<Func<CoreCmsUserServicesOrder, bool>> predicate,
+            Expression<Func<CoreCmsUserServicesOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+
     }
 }

CoreCms.Net.IRepository/Service/ICoreCmsUserServicesTicketRepository.cs

@@ -8,7 +8,12 @@
  *        Description: 暂无
  ***********************************************************************/
 
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using SqlSugar;
 
 namespace CoreCms.Net.IRepository
 {
@@ -59,5 +64,22 @@ namespace CoreCms.Net.IRepository
         //new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
+
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        new Task<IPageList<CoreCmsUserServicesTicket>> QueryPageAsync(
+            Expression<Func<CoreCmsUserServicesTicket, bool>> predicate,
+            Expression<Func<CoreCmsUserServicesTicket, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+
     }
 }

CoreCms.Net.IRepository/Solitaire/ICoreCmsSolitaireItemsRepository.cs

@@ -0,0 +1,118 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2021/6/14 23:18:18
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+
+namespace CoreCms.Net.IRepository
+{
+	/// <summary>
+    /// 接龙活动商品表 工厂接口
+    /// </summary>
+    public interface ICoreCmsSolitaireItemsRepository : IBaseRepository<CoreCmsSolitaireItems>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> InsertAsync(CoreCmsSolitaireItems entity);
+
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> UpdateAsync(CoreCmsSolitaireItems entity);
+
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsSolitaireItems> entity);
+
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+
+        #endregion
+
+        #region 获取缓存的所有数据==========================================================
+
+        /// <summary>
+        /// 获取缓存的所有数据
+        /// </summary>
+        /// <returns></returns>
+        Task<List<CoreCmsSolitaireItems>> GetCaChe();
+
+        /// <summary>
+        ///     更新cache
+        /// </summary>
+        Task<List<CoreCmsSolitaireItems>> UpdateCaChe();
+
+        #endregion
+
+
+
+        /// <summary>
+        ///     重写根据条件查询列表数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        new Task<List<CoreCmsSolitaireItems>> QueryListByClauseAsync(
+            Expression<Func<CoreCmsSolitaireItems, bool>> predicate,
+            Expression<Func<CoreCmsSolitaireItems, object>> orderByExpression, OrderByType orderByType,
+            bool blUseNoLock = false);
+
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        new Task<IPageList<CoreCmsSolitaireItems>> QueryPageAsync(
+            Expression<Func<CoreCmsSolitaireItems, bool>> predicate,
+            Expression<Func<CoreCmsSolitaireItems, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+
+    }
+}

CoreCms.Net.IRepository/Solitaire/ICoreCmsSolitaireRepository.cs

@@ -0,0 +1,120 @@
+/***********************************************************************
+ *            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.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.DTO;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+
+namespace CoreCms.Net.IRepository
+{
+    /// <summary>
+    /// 接龙活动表 工厂接口
+    /// </summary>
+    public interface ICoreCmsSolitaireRepository : IBaseRepository<CoreCmsSolitaire>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> InsertAsync(CoreCmsSolitaire entity);
+
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> UpdateAsync(CoreCmsSolitaire entity);
+
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsSolitaire> entity);
+
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+
+        #endregion
+
+        #region 获取缓存的所有数据==========================================================
+
+        /// <summary>
+        /// 获取缓存的所有数据
+        /// </summary>
+        /// <returns></returns>
+        Task<List<CoreCmsSolitaire>> GetCaChe();
+
+        /// <summary>
+        ///     更新cache
+        /// </summary>
+        Task<List<CoreCmsSolitaire>> UpdateCaChe();
+
+        #endregion
+
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        new Task<IPageList<CoreCmsSolitaire>> QueryPageAsync(
+            Expression<Func<CoreCmsSolitaire, bool>> predicate,
+            Expression<Func<CoreCmsSolitaire, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+
+        /// <summary>
+        /// 取购物车数据的时候，更新价格
+        /// </summary>
+        /// <param name="objectId"></param>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        Task<WebApiCallBack> SolitaireInfo(int objectId, List<CartProducts> list);
+
+
+        /// <summary>
+        /// 获取接龙购买用户记录
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<WebApiCallBack> GetBuyRecord(int id);
+
+    }
+}