点数

Mall.Model/Extend/Point/RB_Member_PointBalance_Extend.cs

@@ -7,6 +7,13 @@ namespace Mall.Model.Extend.Point
 {
    public class RB_Member_PointBalance_Extend: RB_Member_PointBalance
     {
-
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string UserPhoto { get; set; }
     }
 }

Mall.Repository/Point/RB_Member_PointBalanceRepository.cs

@@ -76,8 +76,8 @@ namespace Mall.Repository.Point
                 if (where.OrderId > 0) {
                     sb.AppendFormat(" and OrderId ={0}", where.OrderId);
                 }
-               
             }
+            sb.Append($@" order by Id desc");
             return GetPage<RB_Member_PointBalance_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
         }
     }

Mall.WebApi/Controllers/Education/PointController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Mall.CacheManager.User;
 using Mall.Common.API;
 using Mall.Common.Plugin;
 using Mall.Model.Extend.Point;
@@ -154,21 +155,23 @@ namespace Mall.WebApi.Controllers.Education
         #region 个人中心-点数记录
 
         /// <summary>
-        /// 获取点数记录
+        /// 小程序获取点数记录
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetUserPointDetailPageList() {
+        public ApiResult GetAppletUserPointDetailPageList() {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
             RB_Member_PointBalance_Extend demodel = JsonConvert.DeserializeObject<RB_Member_PointBalance_Extend>(RequestParm.msg.ToString());
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
             var list = pointModule.GetUserPointDetailPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             int PointNum = pointModule.GetUserPointBalance(userInfo.UserId);
             pagelist.count = Convert.ToInt32(count);
-            pagelist.pageData = new { 
+            pagelist.pageData = new
+            {
                 PointNum,
                 List = list.Select(x => new
                 {
@@ -177,12 +180,49 @@ namespace Mall.WebApi.Controllers.Education
                     TypeName = x.Type.GetEnumName(),
                     x.Description,
                     x.PonitNum,
-                    x.CreateDate,
-                    x.Remarks
+                    x.Remarks,
+                    CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
                 })
             };
             return ApiResult.Success("", pagelist);
         }
+
+        /// <summary>
+        /// 后台获取点数记录
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserPointDetailPageList()
+        {
+            var parms = RequestParm;
+            var userInfo = UserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Member_PointBalance_Extend demodel = JsonConvert.DeserializeObject<RB_Member_PointBalance_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            var list = pointModule.GetUserPointDetailPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            list.ForEach(x =>
+            {
+                var umodel = UserReidsCache.GetAppletUserLoginInfo(x.UserId);
+                x.UserName = umodel?.Name ?? "";
+                x.UserPhoto = umodel?.Photo ?? "";
+            });
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.Type,
+                TypeName = x.Type.GetEnumName(),
+                x.Description,
+                x.PonitNum,
+                x.Remarks,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.UserId,
+                x.UserName,
+                x.UserPhoto
+            });
+            return ApiResult.Success("", pagelist);
+        }
         #endregion
 
         #region 在线课程分类