From de17c91e1f49dc2a460277c001949e6b08117e85 Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@163.com>
Date: Wed, 29 Nov 2023 23:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=E5=8F=B0=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=81=94=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=8A=A0=E5=BF=AB?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=80=9F=E5=BA=A6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Model/CoreCms.Net.Model.xml                   | 5 -----
 CoreCms.Net.Model/Entities/User/CoreCmsUserPartial.cs     | 8 --------
 CoreCms.Net.Repository/User/CoreCmsUserRepository.cs      | 1 -
 .../wwwroot/views/user/userInfo/index.html                | 4 ++--
 4 files changed, 2 insertions(+), 16 deletions(-)

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 @@
                 父级名称
             </summary>
         </member>
-        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUser.accumulativePoint">
-            <summary>
-                累计积分
-            </summary>
-        </member>
         <member name="T:CoreCms.Net.Model.Entities.CoreCmsUserBalance">
             <summary>
             用户余额表
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; }
 
-
-        /// <summary>
-        ///     累计积分
-        /// </summary>
-        [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<CoreCmsUser>().Where(o => o.parentId == p.id).Count(),
-                    accumulativePoint = SqlFunc.Subqueryable<CoreCmsUserPointLog>().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 = '<a class="link-hot option-show point" data-id="' + data.id + '" data-type="accumulativePoint">' + data.accumulativePoint + '</a>';
+                                field: 'accumulativePoint', title: '累计积分', sort: false, width: 100, templet: function (data) {
+                                    var html = '<a class="link-hot option-show point" data-id="' + data.id + '" data-type="accumulativePoint">查看历史积分</a>';
                                     return html;
                                 }
                             },