【新增】新增微信扫码支付功能，对接PC端。

【新增】增加DTO类库，将逐步完善dto层。
【修复】修复【分类】切换后，切换回来未清零原始数据，导致更新数据重复的问题。
【调整】移除模板库功能，防止出现审核因为模板库页面存在而导致的审核失败。暂将模板库的代码存放到会员QQ群内，方便下载使用。
【调整】代码生成器【Repository.tpl】移除Cache手动增删改，【SqlSugarSetup】增加sqlsugar自动检测增删改后清理二级缓存。
【调整】后端新增秒杀独立组件，用于区分团购及秒杀的差异，首页新增秒杀组件。
【优化】重写首页所有组件样式及接口数据获取效率。
【优化】优化拼团，秒杀，团购，接龙数据获取逻辑，提升列表及详情页面数据获取效率。
【优化】调整拼团，秒杀，团购，服务商品推广海报为新式海报效果。增加服务商品推广海报。
【优化】清理h5相关代码判断，移除h5支付组件，提高响应速度。
【优化】移除小程序前端冗余代码。加快代码执行效率。

CoreCms.Net.IServices/Article/ICoreCmsArticleTypeServices.cs

@@ -4,18 +4,47 @@
  *                Web: https://www.corecms.net                      
  *             Author: 大灰灰                                          
  *              Email: jianweie@163.com                                
- *         CreateTime: 2021/1/31 21:45:10
+ *         CreateTime: 2022/10/24 3:54:14
  *        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.IServices
 {
     /// <summary>
-    ///     文章分类表 服务工厂接口
+    /// 文章分类表 服务工厂接口
     /// </summary>
     public interface ICoreCmsArticleTypeServices : IBaseServices<CoreCmsArticleType>
     {
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsArticleType entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsArticleType entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
     }
-}
+}

CoreCms.Net.IServices/CoreCms.Net.IServices.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CoreCms.Net.Configuration\CoreCms.Net.Configuration.csproj" />
+    <ProjectReference Include="..\CoreCms.Net.DTO\CoreCms.Net.DTO.csproj" />
     <ProjectReference Include="..\CoreCms.Net.Model\CoreCms.Net.Model.csproj" />
   </ItemGroup>
 

CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs

@@ -114,8 +114,7 @@ namespace CoreCms.Net.IServices
         /// <param name="groupId"></param>
         /// <param name="needSku"></param>
         /// <returns></returns>
-        Task<CoreCmsGoods> GetGoodsDetail(int id, int userId = 0, bool isPromotion = false, string type = "goods",
-            int groupId = 0, bool needSku = false);
+        Task<CoreCmsGoods> GetGoodsDetail(int id, int userId = 0, bool isPromotion = false, string type = "goods", int groupId = 0, bool needSku = false);
 
         /// <summary>
         /// 通过商品序列获取sku列表
@@ -263,5 +262,18 @@ namespace CoreCms.Net.IServices
         Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
+
+
+        /// <summary>
+        ///     获取商品及默认货品信息
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <param name="orderByPredicate"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<List<CoreCmsGoods>> QueryGoodWithDefaultProductAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
+            Expression<Func<CoreCmsGoods, object>> orderByPredicate, OrderByType orderByType, bool blUseNoLock = false);
+
     }
 }

CoreCms.Net.IServices/Pintuan/ICoreCmsPintuanRuleServices.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using CoreCms.Net.DTO;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.Basics;
 using CoreCms.Net.Model.ViewModels.DTO;
@@ -37,7 +38,7 @@ namespace CoreCms.Net.IServices
         ///     接口上获取拼团所有商品
         /// </summary>
         /// <returns></returns>
-        Task<WebApiCallBack> GetPinTuanList(int userId = 0);
+        Task<WebApiCallBack> GetPinTuanList(int userId = 0, int pageIndex = 1, int pageSize = 20);
 
 
         /// <summary>
@@ -60,5 +61,20 @@ namespace CoreCms.Net.IServices
         /// <param name="ruleId">规则序列</param>
         /// <returns></returns>
         Task<TagPinTuanResult> GetPinTuanInfo(int ruleId);
+
+
+
+        /// <summary>
+        ///     根据规则ID数组获取拼团相关信息
+        /// </summary>
+        /// <param name="ruleIds">规则序列</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        Task<IPageList<PinTuanListDTO>> GetPinTuanInfos(int[] ruleIds,
+            Expression<Func<PinTuanListDTO, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20);
     }
 }

CoreCms.Net.IServices/Promotion/ICoreCmsPromotionServices.cs

@@ -51,13 +51,13 @@ namespace CoreCms.Net.IServices
         ///     获取团购列表数据
         /// </summary>
         /// <returns></returns>
-        Task<WebApiCallBack> GetGroupList(int type, int userId, int status, int pageIndex, int pageSize);
+        Task<WebApiCallBack> GetGroupList(int type, int status, int pageIndex, int pageSize);
 
         /// <summary>
         ///     获取团购/秒杀商品详情
         /// </summary>
         /// <returns></returns>
-        Task<WebApiCallBack> GetGroupDetail(int goodId = 0, int userId = 0, int type = (int)GlobalEnumVars.PromotionType.Group, int groupId = 0, bool needSku = false);
+        Task<WebApiCallBack> GetGroupDetail(int goodId, int userId, int type, bool needSku);
 
         /// <summary>
         ///     获取可领取的优惠券

CoreCms.Net.IServices/Shop/ICoreCmsNoticeServices.cs

@@ -38,16 +38,10 @@ namespace CoreCms.Net.IServices
 
 
         /// <summary>
-        ///     获取列表首页用
+        ///     获取首页组件数据
         /// </summary>
         /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
         /// <returns></returns>
-        Task<List<CoreCmsNotice>> QueryListAsync(Expression<Func<CoreCmsNotice, bool>> predicate,
-            Expression<Func<CoreCmsNotice, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20);
+        Task<List<dynamic>> QueryComponentAsync(Expression<Func<CoreCmsNotice, bool>> predicate);
     }
 }