vip购买调整

Mall.Common/API/AppletUserInfo.cs

@@ -132,5 +132,10 @@ namespace Mall.Common
         /// 相亲项目-1已填写，0-未填写
         /// </summary>
         public int IsAddBaseInfo { get; set; }
+
+        /// <summary>
+        /// 普通会员等级
+        /// </summary>
+        public int MemberGrade;
     }
 }
\ No newline at end of file

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -463,7 +463,11 @@ namespace Mall.Model.Entity.User
         /// 相亲0-未开启，1-开启
         /// </summary>
         public int IsOpenMiAi { get; set; }
-        
+
+        /// <summary>
+        /// 普通用户会员Vip购买图片
+        /// </summary>
+        public string MemberBuyVipImg { get; set; }
     }
 
 

Mall.Module.User/MiniProgramModule.cs

@@ -799,6 +799,7 @@ namespace Mall.Module.User
                     { nameof(RB_MiniProgram_Extend.DefaultBgImg),extModel.DefaultBgImg},
                     { nameof(RB_MiniProgram_Extend.MemberBgImg),extModel.MemberBgImg},
                     { nameof(RB_MiniProgram_Extend.VipBgImg),extModel.VipBgImg},
+                    { nameof(RB_MiniProgram_Extend.MemberBuyVipImg),extModel.MemberBuyVipImg},
                     { nameof(RB_MiniProgram_Extend.HeadStyle),extModel.HeadStyle},
                     { nameof(RB_MiniProgram_Extend.HeadStyleStr),extModel.HeadStyleStr},
                     { nameof(RB_MiniProgram_Extend.IsShowFavorite),extModel.IsShowFavorite},

Mall.Module.User/UserModule.cs

@@ -4559,18 +4559,16 @@ namespace Mall.Module.User
                 var MemberGrade = "普通用户";
                 
                 string MemberGradeIcon = "";
-                if (IsHpFX == 1)
+                
+                if (umodel.MemberGrade > 0)
                 {
-                    if (umodel.MemberGrade > 0)
+                    var mgModel = member_GradeRepository.GetEntity(umodel.MemberGrade);
+                    if (mgModel != null)
                     {
-                        var mgModel = member_GradeRepository.GetEntity(umodel.MemberGrade);
-                        if (mgModel != null)
+                        MemberGrade = mgModel.Name;
+                        if (mgModel.Icon > 0)
                         {
-                            MemberGrade = mgModel.Name;
-                            if (mgModel.Icon > 0)
-                            {
-                                MemberGradeIcon = material_InfoRepository.GetEntity(mgModel.Icon)?.Path ?? "";
-                            }
+                            MemberGradeIcon = material_InfoRepository.GetEntity(mgModel.Icon)?.Path ?? "";
                         }
                     }
                 }
@@ -4578,7 +4576,9 @@ namespace Mall.Module.User
                 {
                     MemberGradeIcon = miniConfig?.MemberBgImg ?? "";
                 }
-              
+                //会员等级是否可购买
+                bool IsMemberBuy = member_GradeRepository.GetList(new RB_Member_Grade_Extend() { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, IsMemberBuy = 1, Enabled = 1 }).Any();
+
                 objData = new
                 {
                     //昵称
@@ -4611,6 +4611,7 @@ namespace Mall.Module.User
                         level_name = MemberGrade,
                         level_icon = MemberGradeIcon,
                         is_admin = 0,
+                        is_member_buy = IsMemberBuy
                     },
                     MyOrder = new
                     {

Mall.Repository/User/RB_Member_GradeRepository.cs

@@ -75,6 +75,10 @@ namespace Mall.Repository.User
             {
                 where += $@" and {nameof(RB_Member_Grade.Enabled)} ={(int)dmodel.Enabled}";
             }
+            if (dmodel.IsMemberBuy > 0)
+            {
+                where += $@" and {nameof(RB_Member_Grade.IsMemberBuy)} ={dmodel.IsMemberBuy}";
+            }
             string sql = $@"select * from RB_Member_Grade where {where} order by Grade asc";
             return Get<RB_Member_Grade_Extend>(sql).ToList();
         }

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -580,6 +580,8 @@ namespace Mall.WebApi.Controllers.MallBase
                         member_pic_url = miniProgram.MemberBgImg,
                         //会员中心背景图
                         member_bg_pic_url = miniProgram.VipBgImg,
+                        //普通用户会员Vip购买图片
+                        member_buy_vip_url = miniProgram.MemberBuyVipImg,
                         //头像内嵌背景图[暂无]
                         style_bg_pic_url = "",
 

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -307,6 +307,7 @@ namespace Mall.WebApi.Controllers.User
                     Name = umodel.Name,
                     OpenId = umodel.OpenId,
                     Photo = umodel.Photo,
+                    MemberGrade = umodel.MemberGrade ?? 0,
                     Source = demodel.Source,
                     SecretKey = umodel.SecretKey,
                     SuperiorId = umodel.SuperiorId ?? 0,