提交会员购买接口

Mall.Model/Entity/User/RB_Distributor_Info.cs

@@ -138,5 +138,10 @@ namespace Mall.Model.Entity.User
             get;
             set;
         }
+
+        /// <summary>
+        /// 粉象Vip的有效期
+        /// </summary>
+        public DateTime? VipExpiryDate { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Vip_Buy_Extend.cs

@@ -13,6 +13,9 @@ namespace Mall.Model.Extend.User
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Vip_Buy_Extend : RB_Vip_Buy
     {
-       
+        /// <summary>
+        /// 购买人姓名
+        /// </summary>
+        public string UserName { get; set; }
     }
 }

Mall.Repository/User/RB_Distributor_FXGradeRepository.cs

@@ -80,7 +80,10 @@ namespace Mall.Repository.User
             {
                 where += $@" and {nameof(RB_Distributor_FXGrade.IsGuest)}={dmodel.IsGuest}";
             }
-
+            if (dmodel.IsCanBuy > 0)
+            {
+                where += $@" and {nameof(RB_Distributor_FXGrade.IsCanBuy)}={dmodel.IsCanBuy}";
+            }
             string sql = $@"select * from RB_Distributor_FXGrade where {where} order by Grade asc";
             return Get<RB_Distributor_FXGrade_Extend>(sql).ToList();
         }

Mall.Repository/User/RB_Vip_BuyRepository.cs

@@ -24,20 +24,20 @@ namespace Mall.Repository.User
         public List<RB_Vip_Buy_Extend> GetVipBuyPageList(int pageIndex, int pageSize, out long rowCount, RB_Vip_Buy_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Vip_Buy_Extend.Status)}=0");
+            builder.Append($" SELECT a.*,b.`Name` as UserName FROM rb_vip_buy as a LEFT JOIN rb_member_user as b on a.UserId=b.Id WHERE   a.{nameof(RB_Vip_Buy_Extend.Status)}=0");
             if (query != null)
             {
                 if (query.TenantId > 0)
                 {
-                    builder.Append($" AND {nameof(RB_Vip_Buy_Extend.TenantId)}={query.TenantId}");
+                    builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.TenantId)}={query.TenantId}");
                 }
                 if (query.TenantId > 0)
                 {
-                    builder.Append($" AND {nameof(RB_Vip_Buy_Extend.MallBaseId)}={query.MallBaseId}");
+                    builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.MallBaseId)}={query.MallBaseId}");
                 }
                 if (query.Id > 0)
                 {
-                    builder.Append($" AND {nameof(RB_Vip_Buy_Extend.Id)}={query.Id}");
+                    builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.Id)}={query.Id}");
                 }
             }
             return GetPage<RB_Vip_Buy_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -343,6 +343,18 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             {
                 return ApiResult.Failed("当前会员等级不能购买");
             }
+
+            //判断订单状态是否是待支付 
+            var buyList = userVipModule.GetVipBuyList(new RB_Vip_Buy_Extend { UserId = userInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+
+            if (buyList.Where(x => x.PayState == 1).Count() == 0)
+            {
+                demodel.Remark = "购买";
+            }
+            else
+            {
+                demodel.Remark = "续费";
+            }
             Random R = new Random();
             int Rstr = R.Next(111, 999);
             demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
@@ -352,6 +364,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             demodel.PayState = 0;
             demodel.Status = 0;
             demodel.CreateDate = DateTime.Now;
+            demodel.ExpiryDate = DateTime.Now.AddYears(rechargeRulesModel.Year ?? 1);
             //新增充值记录
             int memberBuyId = userVipModule.AddVipBuy(demodel);
             if (memberBuyId == 0)

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -31,8 +31,7 @@ namespace Mall.WebApi.Controllers.User
         private readonly UserModule userModule = new UserModule();
         private readonly Module.MarketingCenter.CouponModule couponModule = new Module.MarketingCenter.CouponModule();
         private readonly Module.MarketingCenter.RechargeModule rechargeModule = new Module.MarketingCenter.RechargeModule();
-
-       
+        private readonly UserVipModule userVipModule = new UserVipModule();
         #region 收货地址
 
         /// <summary>
@@ -665,7 +664,8 @@ namespace Mall.WebApi.Controllers.User
         /// 获取我的团队  粉象返佣列表
         /// </summary>
         /// <returns></returns>
-        public ApiResult GetUserMyTeamPageListForFX() {
+        public ApiResult GetUserMyTeamPageListForFX()
+        {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
@@ -1020,7 +1020,7 @@ namespace Mall.WebApi.Controllers.User
                 if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
                 {
                     memberCoupon.StartDate = System.DateTime.Now;
-                    LogHelper.WriteInfo(userInfo.Name+"优惠券领取时间:" + memberCoupon.StartDate);
+                    LogHelper.WriteInfo(userInfo.Name + "优惠券领取时间:" + memberCoupon.StartDate);
                     memberCoupon.EndDate = memberCoupon.StartDate.Value.AddDays(oldLogisticsModel.IndateDay);
                 }
                 else
@@ -1239,11 +1239,34 @@ namespace Mall.WebApi.Controllers.User
             var rechargeRules = rechargeModule.GetRechargeRulesList(new RB_Recharge_Rules_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
             //获取充值规则
             var rechargeSettings = rechargeModule.GetRechargeSettingsList(new Model.Entity.MarketingCenter.RB_Recharge_Settings { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
-            return ApiResult.Success("",new { rechargeRules , rechargeSettings });
+            return ApiResult.Success("", new { rechargeRules, rechargeSettings });
         }
         #endregion
 
 
-       
+        #region vip购买
+
+        /// <summary>
+        ///  个人中心- 用户充值设置与规则
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserVipSettings()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+
+            RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(req.msg.ToString());
+            demodel.Id = userInfo.UserId;
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+
+            //获取自定义购买vip页面设置
+            var fxGradeCustom = userVipModule.GetGradeCustomList(new RB_Distributor_FXGradeCustom_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
+            //获取购买vip列表
+            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 });
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/UserVipController.cs

@@ -100,5 +100,39 @@ namespace Mall.WebApi.Controllers.User
             }
         }
         #endregion
+
+
+
+        #region Vip购买记录
+        /// <summary>
+        /// 获取vip购买记录
+        /// </summary>
+        /// <param name="requestMsg"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetVipBuyPageList(object requestMsg)
+        {
+            var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
+            RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(requestParm.msg.ToString());
+            demodel.TenantId = requestParm.TenantId;
+            demodel.MallBaseId = requestParm.MallBaseId;
+            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.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