Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/Point/RB_Member_PointBalance.cs

@@ -89,12 +89,8 @@ namespace Mall.Model.Entity.User
         public UserSourceEnum? PlatformType { get; set; }
 
         /// <summary>
-        /// 订单来源（平台）  枚举
+        /// 订单id
         /// </summary>
-        public UserSourceEnum? OrderSource
-        {
-            get;
-            set;
-        }
+        public int OrderId { get; set; }
     }
 }

Mall.Module.Education/PointModule.cs

@@ -138,8 +138,8 @@ namespace Mall.Module.Education
             return pointGoodsRepository.Update(fileds, auditrecordWhereHelpers);
 
         }
-        #endregion
 
+        #endregion
 
         #region 充值订单
         /// <summary>
@@ -301,6 +301,30 @@ namespace Mall.Module.Education
         #endregion
 
 
+        #region 点数明细
+        /// <summary>
+        /// 获取点数明细
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Member_PointBalance_Extend> GetUserPointDetailPageList(int pageIndex, int pageSize, out long count, RB_Member_PointBalance_Extend demodel)
+        {
+            return memberPointBalanceRepository.GetPointBalancePageList(pageIndex, pageSize, out count, demodel);
+        }
+
+        /// <summary>
+        /// 获取用户点数
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public int GetUserPointBalance(int userId) {
+            return member_UserRepository.GetEntity(userId)?.PointNum ?? 0;
+        }
+        #endregion
+
 
         #region 在线课程分类
         /// <summary>

Mall.Module.User/UserModule.cs

@@ -4591,6 +4591,8 @@ namespace Mall.Module.User
                     integral = umodel?.Integral ?? 0,
                     //余额
                     balance = umodel?.Balance ?? 0,
+                    //点数
+                    pointnum = umodel?.PointNum,
                     //选项todo
                     options = new { },
                     //收藏 todo

Mall.Repository/Point/RB_Member_PointBalanceRepository.cs

@@ -55,7 +55,7 @@ namespace Mall.Repository.Point
         public List<RB_Member_PointBalance_Extend> GetPointBalancePageList(int pageIndex, int pageSize, out long rowsCount, RB_Member_PointBalance_Extend where)
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append($@"SELECT * from RB_Member_PointBalance  where state=0");
+            sb.Append($@"SELECT * from RB_Member_PointBalance  where 1=1 ");
             if (where != null)
             {
                 if (where.TenantId > 0)
@@ -70,6 +70,12 @@ namespace Mall.Repository.Point
                 {
                     sb.AppendFormat(" and ID={0}", where.UserId);
                 }
+                if (where.Type > 0) {
+                    sb.AppendFormat(" and Type ={0}", (int)where.Type);
+                }
+                if (where.OrderId > 0) {
+                    sb.AppendFormat(" and OrderId ={0}", where.OrderId);
+                }
                
             }
             return GetPage<RB_Member_PointBalance_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();

Mall.WebApi/Controllers/Education/PointController.cs

@@ -151,6 +151,39 @@ namespace Mall.WebApi.Controllers.Education
         #endregion
 
 
+        #region 个人中心-点数记录
+
+        /// <summary>
+        /// 获取点数记录
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserPointDetailPageList() {
+            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;
+            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 { 
+                PointNum,
+                List = list.Select(x => new
+                {
+                    x.Id,
+                    x.Type,
+                    TypeName = x.Type.GetEnumName(),
+                    x.Description,
+                    x.PonitNum,
+                    x.CreateDate,
+                    x.Remarks
+                })
+            };
+            return ApiResult.Success("", pagelist);
+        }
+        #endregion
 
         #region 在线课程分类
         /// <summary>

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -567,6 +567,8 @@ namespace Mall.WebApi.Controllers.MallBase
                         is_sdorder_bar_status = (miniProgram.IsShowSDNav == 0 ? 1 : 0),
                         //是否显示收藏夹
                         is_foot_bar_status = (miniProgram.IsShowFavorite == 0 ? 1 : 0),
+                        //是否显示约课
+                        is_point_status = miniProgram.PointStatus,
                         //菜单样式
                         menu_style = (miniProgram.MenuNavStyle == 0 ? 1 : 2),
                         //头像样式