diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.xml b/CoreCms.Net.Model/CoreCms.Net.Model.xml index 73136b7d..aedbf5cf 100644 --- a/CoreCms.Net.Model/CoreCms.Net.Model.xml +++ b/CoreCms.Net.Model/CoreCms.Net.Model.xml @@ -7762,11 +7762,6 @@ 父级名称 - - - 累计积分 - - 用户余额表 diff --git a/CoreCms.Net.Model/Entities/User/CoreCmsUserPartial.cs b/CoreCms.Net.Model/Entities/User/CoreCmsUserPartial.cs index c31d3169..b58a62e4 100644 --- a/CoreCms.Net.Model/Entities/User/CoreCmsUserPartial.cs +++ b/CoreCms.Net.Model/Entities/User/CoreCmsUserPartial.cs @@ -35,13 +35,5 @@ namespace CoreCms.Net.Model.Entities [SugarColumn(IsIgnore = true)] public string parentNickName { get; set; } - - /// - /// 累计积分 - /// - [SugarColumn(IsIgnore = true)] - public int accumulativePoint { get; set; } - - } } \ No newline at end of file diff --git a/CoreCms.Net.Repository/User/CoreCmsUserRepository.cs b/CoreCms.Net.Repository/User/CoreCmsUserRepository.cs index 03eba3cd..0693fb63 100644 --- a/CoreCms.Net.Repository/User/CoreCmsUserRepository.cs +++ b/CoreCms.Net.Repository/User/CoreCmsUserRepository.cs @@ -134,7 +134,6 @@ namespace CoreCms.Net.Repository type = (int)sWeChatInfo.type, parentNickName = sParentUser.nickName, childNum = SqlFunc.Subqueryable().Where(o => o.parentId == p.id).Count(), - accumulativePoint = SqlFunc.Subqueryable().Where(o => o.userId == p.id && o.num > 0).Sum(c => c.num), }) .MergeTable().With(SqlWith.Null) .OrderBy(orderByExpression, orderByType) diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html index a1de4ae1..eb825abc 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html @@ -225,8 +225,8 @@ } }, { - field: 'accumulativePoint', title: '累计积分', sort: false, width: 70, templet: function (data) { - var html = '' + data.accumulativePoint + ''; + field: 'accumulativePoint', title: '累计积分', sort: false, width: 100, templet: function (data) { + var html = '查看历史积分'; return html; } },