提交代码

Mall.Repository/User/RB_Vip_BuyRepository.cs

@@ -7,7 +7,7 @@ using System.Text;
 
 namespace Mall.Repository.User
 {
-    public class RB_Vip_BuyRepository:RepositoryBase<RB_Vip_Buy>
+    public class RB_Vip_BuyRepository : RepositoryBase<RB_Vip_Buy>
     {
         /// <summary>
         /// 表名称
@@ -31,7 +31,7 @@ namespace Mall.Repository.User
                 {
                     builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.TenantId)}={query.TenantId}");
                 }
-                if (query.TenantId > 0)
+                if (query.MallBaseId > 0)
                 {
                     builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.MallBaseId)}={query.MallBaseId}");
                 }
@@ -39,6 +39,14 @@ namespace Mall.Repository.User
                 {
                     builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.Id)}={query.Id}");
                 }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.UserId)}={query.UserId}");
+                }
+                if (query.PayState > -1)
+                {
+                    builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.PayState)}={query.PayState}");
+                }
             }
             return GetPage<RB_Vip_Buy_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
@@ -113,7 +121,7 @@ WHERE a.{nameof(RB_Vip_Buy_Extend.Status)}=0 group by a.Id");
                 {
                     builder.Append($" AND c.{nameof(RB_VipBuy_Commission.UserId)}={query.DistributionUserId}");
                 }
-                if (!string.IsNullOrEmpty(query.OrderNo)) 
+                if (!string.IsNullOrEmpty(query.OrderNo))
                 {
                     builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.OrderNo)} like '%{query.OrderNo}%'");
                 }

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -1267,6 +1267,40 @@ namespace Mall.WebApi.Controllers.User
             var fxGrade = userModule.GetFXDistributorGradeList(new RB_Distributor_FXGrade_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, IsCanBuy = 1, IsGuest = 3 });
             return ApiResult.Success("", new { fxGradeCustom, fxGrade });
         }
+
+
+        /// <summary>
+        ///  个人中心- vip购买记录
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetVipBuyPageList()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(parms.msg.ToString());
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.UserId = AppletUserInfo.UserId;
+            demodel.PayState =1;
+            var list = userVipModule.GetVipBuyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.OrderNo,
+                x.UserName,
+                x.Money,
+                ExpiryDateStr = x.ExpiryDate.HasValue ? x.ExpiryDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.GradeName,
+                x.PayState,
+                x.PayWay,
+                PayTimeStr = x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
         #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/UserVipController.cs

@@ -118,6 +118,7 @@ namespace Mall.WebApi.Controllers.User
             RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(parms.msg.ToString());
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
+            demodel.PayState = -1;
             var list = userVipModule.GetVipBuyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
 
             pagelist.count = Convert.ToInt32(count);
@@ -131,7 +132,7 @@ namespace Mall.WebApi.Controllers.User
                 x.GradeName,
                 x.PayState,
                 x.PayWay,
-                PayTimeStr= x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+                PayTimeStr = x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);
         }
@@ -165,7 +166,8 @@ namespace Mall.WebApi.Controllers.User
                 x.Money,
                 x.GradeName,
                 PayTimeStr = x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-                CommissionList = x.CommissionList.Select(z => new {
+                CommissionList = x.CommissionList.Select(z => new
+                {
                     z.Id,
                     z.Grade,
                     z.GradeDescription,
@@ -257,7 +259,8 @@ namespace Mall.WebApi.Controllers.User
                             IsOCFirst = false;
                         }
                     }
-                    else {
+                    else
+                    {
                         datarow.ExcelRows.Add(new ExcelColumn(value: "") { });
                         datarow.ExcelRows.Add(new ExcelColumn(value: "") { });
                         datarow.ExcelRows.Add(new ExcelColumn(value: "") { });