### 0.6.0 专业版（大版本升级，破坏性升级，请酌情处理）：

【新增】弃用现在sku前端，启用全新sku组件，更加灵活，体验更好。【新增】新增通过商品序列获取sku全新列表功能。【新增】仓储层底层增加二级缓存功能，后面将逐步完善底层缓存中心模块。【新增】0元购，积分兑换模式下，也去计算用户是否科技升级。【新增】数据及业务仓储增加二级缓存功能。curd可自主控制是否缓存和清除。【新增】订单导出excel数据增加商品名称+货品sku组合展示的方式。【新增】自定义交易组件增加【获取商家信息】【更新商家信息】两个接口处理。【新增】增加公告列表及公告详情页面，首页组件公告点击跳转列表展示。【新增】个人中心增加【公告中心】入口。【新增】后台余额变动增加说明录入。【调整】将前端能进行分包的文件夹都进行分包，减少主包占用，方便进行二开。【调整】因ckeditor5存在图片不可设置宽度，上传不支持mp4，排版不畅等情况，降级使用ckeditor4版本。【修复】修复0.5.5版本售后积分返还机制积分模式判断异常的问题。【修复】修复使用积分全额抵扣，或其他优惠政策导致的0元购，未进行短信提醒及小票打印机未打印的问题。【修复】修复更换ckeditor4编辑器后接龙添加编辑调用失败的问题。【修复】修复积分全额抵扣，金额0元购的情况下，进行售后执行完毕，订单未完结的情况。【优化】去除分销申请面板按钮无用并失效报错的customStyle属性。【优化】优化部分方法中使用手写字符串的遗留问题，统一采用enum方式。【优化】优化前端及接口部分命名错误的问题。错将skill误写成seckill。【优化】去除uniapp端多个客服代码。【优化】商品详情底部完善购物车数量显示的问题。【优化】优化团购列表，拼团列表，秒杀页面页面样式布局差异问题。【优化】调整支付结果界面样式效果，仿微信支付结果界面。更加清晰明朗。【优化】优化售后提交页面json计算，开放当用户下单后但未发货情况下，可以申请直接售后的操作需求。【优化】后台商家手机号码支持设置多个，使用小写逗号分隔，方便多个商家管理员接收下单提醒。【优化】后台售后单审核，调整售后商品为必选项。
2026-03-25 17:37:21 +08:00 · 2022-09-14 00:53:04 +08:00
parent 6ce893cb38
commit 7b68f352d7
3118 changed files with 161226 additions and 10176 deletions
--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs
@@ -206,13 +206,13 @@ namespace CoreCms.Net.Web.Admin.Controllers
        {
            var jm = new AdminUiCallBack();

-            var bl = await _coreCmsBrandServices.InsertAsync(entity) > 0;
+            var bl = await _coreCmsBrandServices.InsertAsync(entity, true) > 0;
            jm.code = bl ? 0 : 1;
            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;

            if (bl)
            {
-                var brands = await _coreCmsBrandServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
+                var brands = await _coreCmsBrandServices.QueryAsync(true, true);
                jm.data = new
                {
                    brands
@@ -281,7 +281,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            oldModel.createTime = DateTime.Now;

            //事物处理过程结束
-            var bl = await _coreCmsBrandServices.UpdateAsync(oldModel);
+            var bl = await _coreCmsBrandServices.UpdateAsync(oldModel, true);
            jm.code = bl ? 0 : 1;
            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;

@@ -317,7 +317,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
                return jm;
            }

-            var bl = await _coreCmsBrandServices.DeleteByIdAsync(entity.id);
+            var bl = await _coreCmsBrandServices.DeleteByIdAsync(entity.id, true);
            jm.code = bl ? 0 : 1;
            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
            return jm;
@@ -336,7 +336,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
        /// <returns></returns>
        [HttpPost]
        [Description("设置是否显示")]
-        public async Task<AdminUiCallBack> DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity)
+        public async Task<AdminUiCallBack> DoSetIsShow([FromBody] FMUpdateBoolDataByIntId entity)
        {
            var jm = new AdminUiCallBack();

@@ -350,7 +350,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            oldModel.isShow = entity.data;
            oldModel.createTime = DateTime.Now;

-            var bl = await _coreCmsBrandServices.UpdateAsync(oldModel);
+            var bl = await _coreCmsBrandServices.UpdateAsync(oldModel, true);
            jm.code = bl ? 0 : 1;
            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;

--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs
@@ -72,8 +72,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
        {
            var jm = new AdminUiCallBack();
            //获取数据
-            var list = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.id > 0, p => p.sort,
-                OrderByType.Desc);
+            var list = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.id > 0, p => p.sort, OrderByType.Desc, true, true);
            //返回数据
            jm.data = list;
            jm.code = 0;
@@ -110,8 +109,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
        {
            //返回数据
            var jm = new AdminUiCallBack { code = 0 };
-            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow == true, p => p.sort,
-                OrderByType.Asc);
+            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow == true, p => p.sort, OrderByType.Asc, true, true);
            jm.data = new
            {
                categories = GoodsHelper.GetTree(categories),
@@ -139,8 +137,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure);
            if (bl)
            {
-                var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow == true, p => p.sort,
-                    OrderByType.Asc);
+                var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow == true, p => p.sort, OrderByType.Asc, true, true);
                jm.data = new
                {
                    categories = GoodsHelper.GetTree(categories, false)
@@ -172,8 +169,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            }
            jm.code = 0;

-            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow == true, p => p.sort,
-                OrderByType.Asc); ;
+            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow == true, p => p.sort, OrderByType.Asc, true, true);
            jm.data = new
            {
                model,
@@ -220,7 +216,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            oldModel.createTime = entity.createTime;

            //事物处理过程结束
-            var result = await _coreCmsGoodsCategoryServices.UpdateAsync(oldModel);
+            var result = await _coreCmsGoodsCategoryServices.UpdateAsync(entity);
            var bl = result.code == 0;
            jm.code = bl ? 0 : 1;
            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
@@ -279,7 +275,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
        /// <returns></returns>
        [HttpPost]
        [Description("设置是否显示")]
-        public async Task<AdminUiCallBack> DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity)
+        public async Task<AdminUiCallBack> DoSetIsShow([FromBody] FMUpdateBoolDataByIntId entity)
        {
            var jm = new AdminUiCallBack();

--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs
@@ -18,10 +18,10 @@ using CoreCms.Net.Configuration;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.FromBody;
-using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Filter;
 using CoreCms.Net.Loging;
 using CoreCms.Net.IServices;
+using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Utility.Helper;
 using CoreCms.Net.Utility.Extensions;
 using Microsoft.AspNetCore.Authorization;
--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs
@@ -54,7 +54,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
        private readonly ICoreCmsLabelServices _labelServices;
        private readonly ICoreCmsProductsServices _productsServices;
        private readonly ICoreCmsSettingServices _settingServices;
-        private readonly ICoreCmsGoodsTypeSpecServices _typeSpecServices;
        private readonly ICoreCmsGoodsTypeSpecValueServices _typeSpecValueServices;
        private readonly ICoreCmsUserGradeServices _userGradeServices;
        private readonly ICoreCmsProductsDistributionServices _productsDistributionServices;
@@ -71,13 +70,13 @@ namespace CoreCms.Net.Web.Admin.Controllers
            , ICoreCmsGoodsCategoryServices coreCmsGoodsCategoryServices
            , ICoreCmsUserGradeServices userGradeServices
            , ICoreCmsGoodsParamsServices goodsParamsServices
-            , ICoreCmsGoodsTypeSpecServices typeSpecServices
            , ICoreCmsGoodsTypeSpecValueServices typeSpecValueServices
            , ICoreCmsGoodsGradeServices goodsGradeServices
            , ICoreCmsProductsServices productsServices
            , ICoreCmsGoodsCategoryExtendServices categoryExtendServices
            , ICoreCmsLabelServices labelServices
-            , ICoreCmsProductsDistributionServices productsDistributionServices, ICoreCmsGoodsTypeSpecServices goodsTypeSpecServices)
+            , ICoreCmsProductsDistributionServices productsDistributionServices
+            , ICoreCmsGoodsTypeSpecServices goodsTypeSpecServices)
        {
            _webHostEnvironment = webHostEnvironment;
            _coreCmsGoodsServices = coreCmsGoodsServices;
@@ -86,7 +85,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
            _coreCmsGoodsCategoryServices = coreCmsGoodsCategoryServices;
            _userGradeServices = userGradeServices;
            _goodsParamsServices = goodsParamsServices;
-            _typeSpecServices = typeSpecServices;
            _typeSpecValueServices = typeSpecValueServices;
            _goodsGradeServices = goodsGradeServices;
            _productsServices = productsServices;
@@ -113,112 +111,43 @@ namespace CoreCms.Net.Web.Admin.Controllers
            var where = PredicateBuilder.True<CoreCmsGoods>();
            //获取排序字段
            var orderField = Request.Form["orderField"].FirstOrDefault();
-            Expression<Func<CoreCmsGoods, object>> orderEx;
-            switch (orderField)
+            Expression<Func<CoreCmsGoods, object>> orderEx = orderField switch
            {
-                case "id":
-                    orderEx = p => p.id;
-                    break;
-                case "bn":
-                    orderEx = p => p.bn;
-                    break;
-                case "name":
-                    orderEx = p => p.name;
-                    break;
-                case "brief":
-                    orderEx = p => p.brief;
-                    break;
-                case "price":
-                    orderEx = p => p.price;
-                    break;
-                case "costprice":
-                    orderEx = p => p.costprice;
-                    break;
-                case "mktprice":
-                    orderEx = p => p.mktprice;
-                    break;
-                case "images":
-                    orderEx = p => p.images;
-                    break;
-                case "goodsCategoryId":
-                    orderEx = p => p.goodsCategoryId;
-                    break;
-                case "goodsTypeId":
-                    orderEx = p => p.goodsTypeId;
-                    break;
-                case "brandId":
-                    orderEx = p => p.brandId;
-                    break;
-                case "isNomalVirtual":
-                    orderEx = p => p.isNomalVirtual;
-                    break;
-                case "isMarketable":
-                    orderEx = p => p.isMarketable;
-                    break;
-                case "stock":
-                    orderEx = p => p.stock;  //这里的
-                    break;
-                case "freezeStock":
-                    orderEx = p => p.freezeStock; //这里的
-                    break;
-                case "weight":
-                    orderEx = p => p.weight; //这里的
-                    break;
-                case "unit":
-                    orderEx = p => p.unit;
-                    break;
-                case "intro":
-                    orderEx = p => p.intro;
-                    break;
-                case "spesDesc":
-                    orderEx = p => p.spesDesc;
-                    break;
-                case "parameters":
-                    orderEx = p => p.parameters;
-                    break;
-                case "commentsCount":
-                    orderEx = p => p.commentsCount;
-                    break;
-                case "viewCount":
-                    orderEx = p => p.viewCount;
-                    break;
-                case "buyCount":
-                    orderEx = p => p.buyCount;
-                    break;
-                case "uptime":
-                    orderEx = p => p.uptime;
-                    break;
-                case "downtime":
-                    orderEx = p => p.downtime;
-                    break;
-                case "sort":
-                    orderEx = p => p.sort;
-                    break;
-                case "labelIds":
-                    orderEx = p => p.labelIds;
-                    break;
-                case "newSpec":
-                    orderEx = p => p.newSpec;
-                    break;
-                case "createTime":
-                    orderEx = p => p.createTime;
-                    break;
-                case "updateTime":
-                    orderEx = p => p.updateTime;
-                    break;
-                case "isRecommend":
-                    orderEx = p => p.isRecommend;
-                    break;
-                case "isHot":
-                    orderEx = p => p.isHot;
-                    break;
-                case "isDel":
-                    orderEx = p => p.isDel;
-                    break;
-                default:
-                    orderEx = p => p.id;
-                    break;
-            }
+                "id" => p => p.id,
+                "bn" => p => p.bn,
+                "name" => p => p.name,
+                "brief" => p => p.brief,
+                "price" => p => p.price,
+                "costprice" => p => p.costprice,
+                "mktprice" => p => p.mktprice,
+                "images" => p => p.images,
+                "goodsCategoryId" => p => p.goodsCategoryId,
+                "goodsTypeId" => p => p.goodsTypeId,
+                "brandId" => p => p.brandId,
+                "isNomalVirtual" => p => p.isNomalVirtual,
+                "isMarketable" => p => p.isMarketable,
+                "stock" => p => p.stock,
+                "freezeStock" => p => p.freezeStock,
+                "weight" => p => p.weight,
+                "unit" => p => p.unit,
+                "intro" => p => p.intro,
+                "spesDesc" => p => p.spesDesc,
+                "parameters" => p => p.parameters,
+                "commentsCount" => p => p.commentsCount,
+                "viewCount" => p => p.viewCount,
+                "buyCount" => p => p.buyCount,
+                "uptime" => p => p.uptime,
+                "downtime" => p => p.downtime,
+                "sort" => p => p.sort,
+                "labelIds" => p => p.labelIds,
+                "newSpec" => p => p.newSpec,
+                "createTime" => p => p.createTime,
+                "updateTime" => p => p.updateTime,
+                "isRecommend" => p => p.isRecommend,
+                "isHot" => p => p.isHot,
+                "isDel" => p => p.isDel,
+                _ => p => p.id
+            };

            //设置排序方式
            var orderDirection = Request.Form["orderDirection"].FirstOrDefault();
@@ -294,7 +223,7 @@ namespace CoreCms.Net.Web.Admin.Controllers

            if (list != null && list.Any())
            {
-                var labels = await _labelServices.QueryAsync();
+                var labels = await _labelServices.QueryAsync(true, true);

                foreach (var item in list)
                    if (!string.IsNullOrEmpty(item.labelIds))
@@ -304,7 +233,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
                    }
            }

-
            //返回数据
            jm.data = list;
            jm.code = 0;
@@ -331,8 +259,7 @@ namespace CoreCms.Net.Web.Admin.Controllers

            var totalGoods = await _coreCmsGoodsServices.GetCountAsync(p => p.id > 0 && p.isDel == false);
            var totalMarketableUp = await _coreCmsGoodsServices.GetCountAsync(p => p.isMarketable && p.isDel == false);
-            var totalMarketableDown =
-                await _coreCmsGoodsServices.GetCountAsync(p => p.isMarketable == false && p.isDel == false);
+            var totalMarketableDown = await _coreCmsGoodsServices.GetCountAsync(p => p.isMarketable == false && p.isDel == false);

            //获取库存
            var allConfigs = await _settingServices.GetConfigDictionaries();
@@ -352,10 +279,9 @@ namespace CoreCms.Net.Web.Admin.Controllers
            }

            //获取商品分类
-            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort,
-                OrderByType.Asc);
+            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);
            //获取品牌
-            var brands = await _brandServices.QueryAsync();
+            var brands = await _brandServices.QueryAsync(true, true);

            //获取商品分销方式
            var productsDistributionType = EnumHelper.EnumToList<GlobalEnumVars.ProductsDistributionType>();
@@ -392,20 +318,16 @@ namespace CoreCms.Net.Web.Admin.Controllers
            var jm = new AdminUiCallBack { code = 0 };

            //获取商品分类
-            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc);
-
+            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);
            //获取参数列表
-            var paramsList = await _goodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
+            var paramsList = await _goodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
            //获取SKU列表
-            var skuList = await _goodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
-
-
+            var skuList = await _goodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
            //获取品牌
-            var brands = await _brandServices.QueryListByClauseAsync(p => p.id > 0 && p.isShow == true, p => p.id, OrderByType.Desc, true);
+            var brands = await _brandServices.QueryListByClauseAsync(p => p.id > 0 && p.isShow == true, p => p.id, OrderByType.Desc, true, true);
            //获取用户等级
            var userGrade = await _userGradeServices.QueryAsync();

-
            //获取商品分销enum
            var productsDistributionType = EnumHelper.EnumToList<GlobalEnumVars.ProductsDistributionType>();

@@ -466,29 +388,24 @@ namespace CoreCms.Net.Web.Admin.Controllers
            jm.code = 0;

            //获取商品分类
-            var categories = await _coreCmsGoodsCategoryServices.GetCaChe();
-            categories = categories.Where(p => p.isShow == true).ToList();
-
+            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);
            //获取用户等级
            var userGrade = await _userGradeServices.QueryAsync();
            //用户价格体系
            var goodsGrades = await _goodsGradeServices.QueryListByClauseAsync(p => p.goodsId == model.id);
            //货品信息
-            var products =
-                await _productsServices.QueryListByClauseAsync(p => p.goodsId == model.id && p.isDel == false);
+            var products = await _productsServices.QueryListByClauseAsync(p => p.goodsId == model.id && p.isDel == false);
            //扩展信息
            var categoryExtend = await _categoryExtendServices.QueryListByClauseAsync(p => p.goodsId == model.id);
            //获取商品分销enum
            var productsDistributionType = EnumHelper.EnumToList<GlobalEnumVars.ProductsDistributionType>();

-
            //获取参数列表
-            var paramsList = await _goodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
+            var paramsList = await _goodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
            //获取SKU列表
-            var skuList = await _goodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
-
+            var skuList = await _goodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
            //获取品牌
-            var brands = await _brandServices.QueryListByClauseAsync(p => p.id > 0 && p.isShow == true, p => p.id, OrderByType.Desc, true);
+            var brands = await _brandServices.QueryListByClauseAsync(p => p.id > 0 && p.isShow == true, p => p.id, OrderByType.Desc, true, true);


            if (products != null && products.Any())
@@ -527,7 +444,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            if (!string.IsNullOrEmpty(model.goodsSkuIds))
            {
                var specIds = Utility.Helper.CommonHelper.StringToIntArray(model.goodsSkuIds);
-                var typeSpecs = await _typeSpecServices.QueryListByClauseAsync(p => specIds.Contains(p.id));
+                var typeSpecs = skuList.Where(p => specIds.Contains(p.id)).ToList();
                var typeSpecValues = await _typeSpecValueServices.QueryListByClauseAsync(p => specIds.Contains(p.specId));
                typeSpecs.ForEach(p =>
                {
@@ -638,8 +555,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            jm.code = 0;

            //获取商品分类
-            var categories = await _coreCmsGoodsCategoryServices.GetCaChe();
-            categories = categories.Where(p => p.isShow == true).ToList();
+            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);

            //获取用户等级
            var userGrade = await _userGradeServices.QueryAsync();
@@ -655,12 +571,12 @@ namespace CoreCms.Net.Web.Admin.Controllers


            //获取参数列表
-            var paramsList = await _goodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
+            var paramsList = await _goodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
            //获取SKU列表
            var skuList = await _goodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);

            //获取品牌
-            var brands = await _brandServices.QueryListByClauseAsync(p => p.id > 0 && p.isShow == true, p => p.id, OrderByType.Desc, true);
+            var brands = await _brandServices.QueryListByClauseAsync(p => p.id > 0 && p.isShow == true, p => p.id, OrderByType.Desc, true, true);


            if (products != null && products.Any())
@@ -699,7 +615,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            if (!string.IsNullOrEmpty(model.goodsSkuIds))
            {
                var specIds = Utility.Helper.CommonHelper.StringToIntArray(model.goodsSkuIds);
-                var typeSpecs = await _typeSpecServices.QueryListByClauseAsync(p => specIds.Contains(p.id));
+                var typeSpecs = await _goodsTypeSpecServices.QueryListByClauseAsync(p => specIds.Contains(p.id));
                var typeSpecValues = await _typeSpecValueServices.QueryListByClauseAsync(p => specIds.Contains(p.specId));
                typeSpecs.ForEach(p =>
                {
@@ -910,7 +826,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
                return jm;
            }

-            var typeSpecs = await _typeSpecServices.QueryListByClauseAsync(p => entity.id.Contains(p.id));
+            var typeSpecs = await _goodsTypeSpecServices.QueryListByClauseAsync(p => entity.id.Contains(p.id));
            var typeSpecValues = await _typeSpecValueServices.QueryListByClauseAsync(p => entity.id.Contains(p.specId));
            typeSpecs.ForEach(p => { p.specValues = typeSpecValues.Where(o => o.specId == p.id).ToList(); });

--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs
@@ -48,6 +48,8 @@ namespace CoreCms.Net.Web.Admin.Controllers
        /// <summary>
        ///     构造函数
        /// </summary>
+        /// <param name="webHostEnvironment"></param>
+        /// <param name="coreCmsGoodsParamsServices"></param>
        public CoreCmsGoodsParamsController(IWebHostEnvironment webHostEnvironment,
            ICoreCmsGoodsParamsServices coreCmsGoodsParamsServices)
        {
@@ -231,14 +233,14 @@ namespace CoreCms.Net.Web.Admin.Controllers
            var jm = new AdminUiCallBack();

            entity.createTime = DateTime.Now;
-            var bl = await _coreCmsGoodsParamsServices.InsertAsync(entity) > 0;
+            var bl = await _coreCmsGoodsParamsServices.InsertAsync(entity, true) > 0;
            jm.code = bl ? 0 : 1;
            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;

            if (bl)
            {
                //获取列表
-                var paramsList = await _coreCmsGoodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
+                var paramsList = await _coreCmsGoodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
                jm.data = new
                {
                    paramsList
@@ -312,7 +314,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            oldModel.updateTime = DateTime.Now;

            //事物处理过程结束
-            var bl = await _coreCmsGoodsParamsServices.UpdateAsync(oldModel);
+            var bl = await _coreCmsGoodsParamsServices.UpdateAsync(oldModel, true);
            jm.code = bl ? 0 : 1;
            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;

@@ -342,7 +344,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
                return jm;
            }

-            var bl = await _coreCmsGoodsParamsServices.DeleteByIdAsync(entity.id);
+            var bl = await _coreCmsGoodsParamsServices.DeleteByIdAsync(entity.id, true);
            jm.code = bl ? 0 : 1;
            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
            return jm;
@@ -398,9 +400,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            //添加一个sheet
            var sheet1 = book.CreateSheet("Sheet1");
            //获取list数据
-            var listmodel =
-                await _coreCmsGoodsParamsServices.QueryListByClauseAsync(p => entity.id.Contains(p.id), p => p.id,
-                    OrderByType.Asc);
+            var listmodel = await _coreCmsGoodsParamsServices.QueryListByClauseAsync(p => entity.id.Contains(p.id), p => p.id, OrderByType.Asc);
            //给sheet1添加第一行的头部标题
            var row1 = sheet1.CreateRow(0);
            row1.CreateCell(0).SetCellValue("序列");
@@ -493,8 +493,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            //添加一个sheet
            var sheet1 = book.CreateSheet("Sheet1");
            //获取list数据
-            var listmodel =
-                await _coreCmsGoodsParamsServices.QueryListByClauseAsync(where, p => p.id, OrderByType.Asc);
+            var listmodel = await _coreCmsGoodsParamsServices.QueryListByClauseAsync(where, p => p.id, OrderByType.Asc);
            //给sheet1添加第一行的头部标题
            var row1 = sheet1.CreateRow(0);
            row1.CreateCell(0).SetCellValue("序列");
--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs
@@ -109,15 +109,14 @@ namespace CoreCms.Net.Web.Admin.Controllers
            var sort = Request.Form["sort"].FirstOrDefault().ObjectToInt(0);
            if (sort > 0) @where = @where.And(p => p.sort == sort);
            //获取数据
-            var list = await _coreCmsGoodsTypeSpecServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent,
-                pageSize);
+            var list = await _coreCmsGoodsTypeSpecServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true, true);

            if (list != null && list.Any())
            {
                var ids = list.Select(p => p.id).ToList();
                if (ids.Any())
                {
-                    var values = await _valueServices.QueryListByClauseAsync(p => ids.Contains(p.specId));
+                    var values = await _valueServices.QueryListByClauseAsync(p => ids.Contains(p.specId), p => p.id, OrderByType.Asc, true, true);
                    foreach (var item in list)
                        item.specValues = values.Where(p => p.specId == item.id).OrderBy(p => p.sort).ToList();
                }
@@ -186,7 +185,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
            if (jm.code == 0)
            {
                //获取SKU列表
-                var skuList = await _coreCmsGoodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
+                var skuList = await _coreCmsGoodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
                jm.data = new
                {
                    skuList
@@ -218,9 +217,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
                return jm;
            }

-            var values =
-                await _valueServices.QueryListByClauseAsync(p => p.specId == model.id, p => p.sort,
-                    OrderByType.Asc);
+            var values = await _valueServices.QueryListByClauseAsync(p => p.specId == model.id, p => p.sort, OrderByType.Asc);
            model.specValues = values;
            jm.code = 0;
            jm.data = model;
--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs
@@ -18,10 +18,10 @@ using CoreCms.Net.Configuration;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.FromBody;
-using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Filter;
 using CoreCms.Net.Loging;
 using CoreCms.Net.IServices;
+using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Utility.Helper;
 using CoreCms.Net.Utility.Extensions;
 using Microsoft.AspNetCore.Authorization;