充值记录

Mall.Model/Extend/Point/RB_Point_Order_Extend.cs

@@ -12,6 +12,11 @@ namespace Mall.Model.Extend.Point
         /// </summary>
         public string UserName { get; set; }
 
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string UserPhoto { get; set; }
+
 
         /// <summary>
         /// 点数商品id

Mall.Module.Education/PointModule.cs

@@ -180,9 +180,8 @@ namespace Mall.Module.Education
         /// <param name="rowsCount"></param>
         /// <param name="where"></param>
         /// <returns></returns>
-        public List<RB_Point_Order_Extend> GetPointGoodsPageList(int pageIndex, int pageSize, out long rowsCount, RB_Point_Order_Extend where)
+        public List<RB_Point_Order_Extend> GetPointOrderPageList(int pageIndex, int pageSize, out long rowsCount, RB_Point_Order_Extend where)
         {
-
             return pointOrderRepository.GetPointOrderPageList(pageIndex, pageSize, out rowsCount, where);
         }
 

Mall.Repository/Point/RB_Point_OrderRepository.cs

@@ -55,7 +55,7 @@ namespace Mall.Repository.Point
         public List<RB_Point_Order_Extend> GetPointOrderPageList(int pageIndex, int pageSize, out long rowsCount, RB_Point_Order_Extend where)
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append($@"SELECT a.*,b.`Name` as UserName from RB_Point_order as a LEFT JOIN rb_member_user as b  on a.UserId=b.Id where a.state=0 ");
+            sb.Append($@"SELECT a.*,b.`Name` as UserName,b.Photo as UserPhoto from RB_Point_order as a LEFT JOIN rb_member_user as b  on a.UserId=b.Id where a.state=0 ");
             if (where != null)
             {
                 if (where.TenantId > 0)
@@ -74,7 +74,16 @@ namespace Mall.Repository.Point
                 {
                     sb.AppendFormat(" and a.OrderStatus={0}", where.OrderStatus);
                 }
+                if (where.UserId > 0)
+                {
+                    sb.AppendFormat(" and a.UserId={0}", where.UserId);
+                }
+                if (!string.IsNullOrEmpty(where.OrderNo))
+                {
+                    sb.AppendFormat(" and a.OrderNo like '%{0}%'", where.OrderNo);
+                }
             }
+            sb.Append(" order by a.ID desc");
             return GetPage<RB_Point_Order_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
         }
     }

Mall.WebApi/Controllers/Education/AppletPointController.cs

@@ -62,6 +62,40 @@ namespace Mall.WebApi.Controllers.Education
             };
             return ApiResult.Success("", pagelist);
         }
+
+        /// <summary>
+        /// 后台获取充值订单列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletUserPointOrderPageList()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Point_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Point_Order_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            demodel.OrderStatus = 2;
+            var list = pointModule.GetPointOrderPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.OrderNo,
+                x.PonitNum,
+                x.OldPonitNum,
+                x.GivePoint,
+                x.Income,
+                PaymentTime = x.PaymentTime.HasValue ? x.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.PaymentWay,
+                PaymentWayName = x.PaymentWay.GetEnumName(),
+                x.UserId,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+            });
+            return ApiResult.Success("", pagelist);
+        }
         #endregion
 
         #region 老师课程

Mall.WebApi/Controllers/Education/PointController.cs

@@ -154,68 +154,73 @@ namespace Mall.WebApi.Controllers.Education
         #region 个人中心-点数记录
 
         /// <summary>
-        /// 小程序获取点数记录
+        /// 后台获取点数记录
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetAppletUserPointDetailPageList()
+        public ApiResult GetUserPointDetailPageList()
         {
             var parms = RequestParm;
-            var userInfo = AppletUserInfo;
+            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;
-            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
+            list.ForEach(x =>
             {
-                PointNum,
-                List = 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") : ""
-                })
-            };
+                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);
         }
 
         /// <summary>
-        /// 后台获取点数记录
+        /// 后台获取充值订单列表
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetUserPointDetailPageList()
+        public ApiResult GetUserPointOrderPageList()
         {
             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());
+            RB_Point_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Point_Order_Extend>(RequestParm.msg.ToString());
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
-            var list = pointModule.GetUserPointDetailPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            var list = pointModule.GetPointOrderPageList(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.ID,
+                x.OrderNo,
                 x.PonitNum,
-                x.Remarks,
+                x.OldPonitNum,
+                x.GivePoint,
+                x.Income,
+                PaymentTime = x.PaymentTime.HasValue ? x.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.PaymentWay,
+                PaymentWayName = x.PaymentWay.GetEnumName(),
+                x.OrderStatus,
+                x.OrderSource,
+                OrderSourceName = x.OrderSource.GetEnumName(),
+                x.PayWay,
+                PayWayName = x.PayWay.GetEnumName(),
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 x.UserId,
                 x.UserName,