# 2022-05-07

### 1.4.4开源社区版：
无
### 0.3.9 专业版：
【新增】增加[coreshop-advert]广告组件，对标后台管理功能的广告管理，前端可直接使用代码<coreshop-advert codes="广告位code"></coreshop-advert>来实现在前端任何地方引用广告组件。
【新增】商城栏目页面增加广告组件使用示例。
【新增】用户表增加【是否开启自动升级】【发展用户数量】【订单消费金额】【充值总金额】【权重优先级】字段，并完善用户升级队列处理逻辑。
【调整】文章管理的修改和编辑弹窗模式，修改为单页面模式，解决弹窗情况下编辑器某些按钮因为z-index导致的被阻挡显示的问题。
【优化】优化首页组件的样式，将一些常见方法进行统一封装到混合器里面。

CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs

@@ -55,10 +55,9 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
 
         #region 获取列表============================================================
-
         // POST: Api/CoreCmsUserGrade/GetPageList
         /// <summary>
-        ///     获取列表
+        /// 获取列表
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -71,22 +70,19 @@ namespace CoreCms.Net.Web.Admin.Controllers
             var where = PredicateBuilder.True<CoreCmsUserGrade>();
             //获取排序字段
             var orderField = Request.Form["orderField"].FirstOrDefault();
-            Expression<Func<CoreCmsUserGrade, object>> orderEx;
-            switch (orderField)
+
+            Expression<Func<CoreCmsUserGrade, object>> orderEx = orderField switch
             {
-                case "id":
-                    orderEx = p => p.id;
-                    break;
-                case "title":
-                    orderEx = p => p.title;
-                    break;
-                case "isDefault":
-                    orderEx = p => p.isDefault;
-                    break;
-                default:
-                    orderEx = p => p.id;
-                    break;
-            }
+                "id" => p => p.id,
+                "title" => p => p.title,
+                "isDefault" => p => p.isDefault,
+                "isOpenUpgrade" => p => p.isOpenUpgrade,
+                "developNum" => p => p.developNum,
+                "expenditureMoney" => p => p.expenditureMoney,
+                "rechargeAmount" => p => p.rechargeAmount,
+                "prioritySortId" => p => p.prioritySortId,
+                _ => p => p.prioritySortId
+            };
 
             //设置排序方式
             var orderDirection = Request.Form["orderDirection"].FirstOrDefault();
@@ -100,18 +96,62 @@ namespace CoreCms.Net.Web.Admin.Controllers
 
             //id int
             var id = Request.Form["id"].FirstOrDefault().ObjectToInt(0);
-            if (id > 0) @where = @where.And(p => p.id == id);
+            if (id > 0)
+            {
+                where = where.And(p => p.id == id);
+            }
             //标题 nvarchar
             var title = Request.Form["title"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(title)) @where = @where.And(p => p.title.Contains(title));
+            if (!string.IsNullOrEmpty(title))
+            {
+                where = where.And(p => p.title.Contains(title));
+            }
             //是否默认 bit
             var isDefault = Request.Form["isDefault"].FirstOrDefault();
             if (!string.IsNullOrEmpty(isDefault) && isDefault.ToLowerInvariant() == "true")
-                @where = @where.And(p => p.isDefault);
+            {
+                where = where.And(p => p.isDefault == true);
+            }
             else if (!string.IsNullOrEmpty(isDefault) && isDefault.ToLowerInvariant() == "false")
-                @where = @where.And(p => p.isDefault == false);
+            {
+                where = where.And(p => p.isDefault == false);
+            }
+            //开启自动升级 bit
+            var isOpenUpgrade = Request.Form["isOpenUpgrade"].FirstOrDefault();
+            if (!string.IsNullOrEmpty(isOpenUpgrade) && isOpenUpgrade.ToLowerInvariant() == "true")
+            {
+                where = where.And(p => p.isOpenUpgrade == true);
+            }
+            else if (!string.IsNullOrEmpty(isOpenUpgrade) && isOpenUpgrade.ToLowerInvariant() == "false")
+            {
+                where = where.And(p => p.isOpenUpgrade == false);
+            }
+            //发展用户数量 int
+            var developNum = Request.Form["developNum"].FirstOrDefault().ObjectToInt(0);
+            if (developNum > 0)
+            {
+                where = where.And(p => p.developNum == developNum);
+            }
+            //订单消费金额 int
+            var expenditureMoney = Request.Form["expenditureMoney"].FirstOrDefault().ObjectToInt(0);
+            if (expenditureMoney > 0)
+            {
+                where = where.And(p => p.expenditureMoney == expenditureMoney);
+            }
+            //充值总金额 int
+            var rechargeAmount = Request.Form["rechargeAmount"].FirstOrDefault().ObjectToInt(0);
+            if (rechargeAmount > 0)
+            {
+                where = where.And(p => p.rechargeAmount == rechargeAmount);
+            }
+            //权重优先级 int
+            var prioritySortId = Request.Form["prioritySortId"].FirstOrDefault().ObjectToInt(0);
+            if (prioritySortId > 0)
+            {
+                where = where.And(p => p.prioritySortId == prioritySortId);
+            }
             //获取数据
-            var list = await _coreCmsUserGradeServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize);
+            var list = await _coreCmsUserGradeServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
             //返回数据
             jm.data = list;
             jm.code = 0;
@@ -119,7 +159,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
             jm.msg = "数据调用成功!";
             return jm;
         }
-
         #endregion
 
         #region 首页数据============================================================
@@ -258,6 +297,12 @@ namespace CoreCms.Net.Web.Admin.Controllers
             oldModel.id = entity.id;
             oldModel.title = entity.title;
             oldModel.isDefault = entity.isDefault;
+            oldModel.isOpenUpgrade = entity.isOpenUpgrade;
+            oldModel.developNum = entity.developNum;
+            oldModel.expenditureMoney = entity.expenditureMoney;
+            oldModel.rechargeAmount = entity.rechargeAmount;
+            oldModel.prioritySortId = entity.prioritySortId;
+
             //事物处理过程结束
             var bl = await _coreCmsUserGradeServices.UpdateAsync(oldModel);
             jm.code = bl ? 0 : 1;
@@ -398,5 +443,35 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
 
         #endregion
+
+        #region 设置开启自动升级============================================================
+        // POST: Api/CoreCmsUserGrade/DoSetisOpenUpgrade/10
+        /// <summary>
+        /// 设置开启自动升级
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Description("设置开启自动升级")]
+        public async Task<AdminUiCallBack> DoSetisOpenUpgrade([FromBody] FMUpdateBoolDataByIntId entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var oldModel = await _coreCmsUserGradeServices.QueryByIdAsync(entity.id, false);
+            if (oldModel == null)
+            {
+                jm.msg = "不存在此信息";
+                return jm;
+            }
+            oldModel.isOpenUpgrade = (bool)entity.data;
+
+            var bl = await _coreCmsUserGradeServices.UpdateAsync(p => new CoreCmsUserGrade() { isOpenUpgrade = oldModel.isOpenUpgrade }, p => p.id == oldModel.id);
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+        #endregion
+
     }
 }