页面修改

Mall.Common/API/RequestParm.cs

@@ -72,5 +72,10 @@ namespace Mall.Common.API
         /// 用户OpenId
         /// </summary>
         public string OpenId { get; set; }
+
+        /// <summary>
+        /// 小程序登录用户编号
+        /// </summary>
+        public int UserId { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Miniprogram_Bottomnav_Extend.cs

@@ -16,5 +16,10 @@ namespace Mall.Model.Extend.User
         /// 标签是否激活状态【前端使用】
         /// </summary>
         public bool IsActive { get; set; }
+
+        /// <summary>
+        /// 标签编号【查询使用】
+        /// </summary>
+        public string TagIds { get; set; }
     }
 }

Mall.Module.User/MiniProgramModule.cs

@@ -441,7 +441,7 @@ namespace Mall.Module.User
             }
             if (isGetNav == 1)
             {
-                extModel.BottomTagList = bottomnavRepository.GetListRepository(new RB_Miniprogram_Bottomnav_Extend() { MallBaseId = extModel.MallBaseId });
+                extModel.BottomTagList = GetMiniprogramBottomnavListModule(new RB_Miniprogram_Bottomnav_Extend() { MallBaseId = extModel.MallBaseId });
                 if (extModel.BottomTagList != null && extModel.BottomTagList.Count > 0)
                 {
                     extModel.BottomTagList.FirstOrDefault().IsActive = true;
@@ -548,6 +548,16 @@ namespace Mall.Module.User
             return flag;
         }
 
+        /// <summary>
+        /// 根据查询条件获取小程序底部导航标签列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_Bottomnav_Extend> GetMiniprogramBottomnavListModule(RB_Miniprogram_Bottomnav_Extend query)
+        {
+            return bottomnavRepository.GetMiniprogramBottomnavListRepository(query);
+        }
+
         /// <summary>
         /// 删除小程序底部导航
         /// </summary>

Mall.Repository/User/RB_Miniprogram_BottomnavRepository.cs

@@ -12,11 +12,11 @@ namespace Mall.Repository.User
     public class RB_Miniprogram_BottomnavRepository : RepositoryBase<RB_Miniprogram_Bottomnav>
     {
         /// <summary>
-        /// 根据查询条件获取小程序列表
+        /// 根据查询条件获取小程序底部导航标签列表
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public List<RB_Miniprogram_Bottomnav_Extend> GetListRepository(RB_Miniprogram_Bottomnav_Extend query)
+        public List<RB_Miniprogram_Bottomnav_Extend> GetMiniprogramBottomnavListRepository(RB_Miniprogram_Bottomnav_Extend query)
         {
             StringBuilder builder = new StringBuilder();
             builder.Append(" SELECT * FROM RB_Miniprogram_Bottomnav WHERE 1=1 AND Status=0 ");
@@ -30,13 +30,18 @@ namespace Mall.Repository.User
                 {
                     builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
                 }
+                if (query.TagIds != null && !string.IsNullOrWhiteSpace(query.TagIds))
+                {
+                    builder.AppendFormat(" AND TagId IN({0}) ", query.TagIds);
+                }
             }
             builder.Append(" ORDER BY TagSort ");
             return Get<RB_Miniprogram_Bottomnav_Extend>(builder.ToString()).ToList();
         }
 
+
         /// <summary>
-        /// 删除底部导航
+        /// 删除小程序底部导航
         /// </summary>
         /// <param name="Ids"></param>
         /// <returns></returns>

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -1703,7 +1703,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         style_bg_pic_url = "",
 
                         //账户相关菜单
-                        account = miniProgram?.AccountMenuList.Select(qitem => new
+                        account = miniProgram?.AccountMenuList?.Select(qitem => new
                         {
                             icon_url = qitem.MenuIcon,
                             name = qitem.MenuName.Replace("我的", "").Replace("明细", "").Replace("记录", ""),
@@ -1711,7 +1711,7 @@ namespace Mall.WebApi.Controllers.MallBase
                             link_url = qitem.MenuUrl.Trim(),
                         }),
                         //自定义菜单
-                        menus = miniProgram?.SelfMenuList.Select(qitem => new
+                        menus = miniProgram?.SelfMenuList?.Select(qitem => new
                         {
                             icon_url = qitem.MenuIcon,
                             name = qitem.MenuName,
@@ -1721,7 +1721,7 @@ namespace Mall.WebApi.Controllers.MallBase
 
                         }),
                         //订单菜单列表
-                        order_bar = miniProgram?.OrderMenuList.Select(qitem => new
+                        order_bar = miniProgram?.OrderMenuList?.Select(qitem => new
                         {
                             icon_url = qitem.MenuIcon,
                             name = qitem.MenuName,
@@ -1730,7 +1730,7 @@ namespace Mall.WebApi.Controllers.MallBase
                             text = "",
                         }),
                         //收藏足迹
-                        foot_bar = miniProgram?.FavoriteFootMenuList.Select(qitem => new
+                        foot_bar = miniProgram?.FavoriteFootMenuList?.Select(qitem => new
                         {
                             icon_url = qitem.MenuIcon,
                             name = qitem.MenuName,

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -384,7 +384,7 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull();
             }
-            int UserId = prams.GetInt("UserId", 0);
+            int UserId = req.UserId;
             RB_Member_User_Extend userModel = new RB_Member_User_Extend();
             List<RB_Member_Grade_Extend> memeberList = new List<RB_Member_Grade_Extend>();
             if (UserId > 0)

Mall.WebApi/Controllers/User/TenantController.cs

@@ -63,7 +63,7 @@ namespace Mall.WebApi.Controllers.User
         /// <summary>
         /// 插件处理类
         /// </summary>
-        private Module.User.PlugInModule plugInModule = new Module.User.PlugInModule();
+        private readonly Module.User.PlugInModule plugInModule = new Module.User.PlugInModule();
 
         /// <summary>
         /// 员工管理处理类
@@ -390,8 +390,13 @@ namespace Mall.WebApi.Controllers.User
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var TagId = parms.GetStringValue("TagId");
-            var flag = programModule.RemoveMiniProgramMallTagModule(TagId);
-            return flag ? ApiResult.Success() : ApiResult.Failed();
+            var tagList = programModule.GetMiniprogramBottomnavListModule(new RB_Miniprogram_Bottomnav_Extend() { TagIds = TagId });
+            if (tagList.Count > 0)
+            {
+                var flag = programModule.RemoveMiniProgramMallTagModule(TagId);
+                return flag ? ApiResult.Success() : ApiResult.Failed();
+            }
+            return ApiResult.Success();
         }
 
         /// <summary>