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

Mall.Common/API/RequestParm.cs

@@ -57,5 +57,10 @@ namespace Mall.Common.API
         /// 语种类型
         /// </summary>
         public LanguageTypeEnum languageType { get; set; }
+
+        /// <summary>
+        /// 员工编号【员工登录时使用】
+        /// </summary>
+        public int EmpId { get; set; }
     }
 }

Mall.Common/API/UserInfo.cs

@@ -121,5 +121,10 @@ namespace Mall.Common
         /// SecretKey
         /// </summary>
         public string SecretKey { get; set; }
+
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public int EmpId { get; set; }
     }
 }

Mall.Model/Entity/User/RB_Mall_Magic.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 图片魔方表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Mall_Magic
+    {
+        /// <summary>
+        /// 魔方Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 魔方名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 魔方样式
+        /// </summary>        
+        public int? Style
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 魔方数据[JSON]格式
+        /// </summary>        
+        public string MagicData
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商户号Id
+        /// </summary>        
+        public int? TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>        
+        public int? MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Mall.Model/Entity/User/RB_Mall_Nav.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 轮播图表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Mall_Nav
+    {
+        /// <summary>
+        /// 导航编号
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 标题
+        /// </summary>        
+        public string NavName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 链接
+        /// </summary>        
+        public string NavLink
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 图片
+        /// </summary>        
+        public string NavImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商户号Id
+        /// </summary>        
+        public int? TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>        
+        public int? MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -377,5 +377,10 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public string Version { get; set; }
 
+        /// <summary>
+        /// 小程序首页配置
+        /// </summary>
+        public string MallHomeData { get; set; }
+
     }
 }

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -231,7 +231,7 @@ namespace Mall.Model.Extend.MarketingCenter
         public string url { get; set; }
 
         /// <summary>
-        /// openType
+        /// 打开方式
         /// </summary>
         public string openType { get; set; }
     }
@@ -308,16 +308,28 @@ namespace Mall.Model.Extend.MarketingCenter
     public class topicItem
     {
         /// <summary>
-        /// 样式
+        /// 专题样式
         /// </summary>
         public string normal { get; set; }
 
+        /// <summary>
+        /// 显示行数
+        /// </summary>
         public int count { get; set; }
 
+        /// <summary>
+        /// logo(1行)
+        /// </summary>
         public string logo_1 { get; set; }
 
+        /// <summary>
+        /// logo(2行)
+        /// </summary>
         public string logo_2 { get; set; }
 
+        /// <summary>
+        /// 专题标签
+        /// </summary>
         public string icon { get; set; }
 
         /// <summary>
@@ -517,15 +529,56 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class rubikDetailItem
     {
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
         public string backgroundColor { get; set; }
+
         public int numberX { get; set; }
+
         public int numberY { get; set; }
 
         public int x { get; set; }
         public int y { get; set; }
         public int w { get; set; }
         public int h { get; set; }
+
+        /// <summary>
+        /// 图片导航链接
+        /// </summary>
         public rubikLinkItem link { get; set; }
+
+        /// <summary>
+        /// 宽度
+        /// </summary>
+        public string width { get; set; }
+
+        /// <summary>
+        /// 高度
+        /// </summary>
+        public string height { get; set; }
+
+        /// <summary>
+        /// 左
+        /// </summary>
+        public string left { get; set; }
+
+        /// <summary>
+        /// 顶部
+        /// </summary>
+        public string top { get; set; }
+
+        public string pic_url { get; set; }
+
+        public string backgroundImage { get; set; }
+
+        public  string backgroundRepeat { get; set; }
+
+        public  string backgroundSize { get; set; }
+
+        public string backgroundPosition { get; set; }
+
+        public int zIndex { get; set; }
     }
 
     /// <summary>
@@ -559,22 +612,49 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class hotspotItem
     {
+        /// <summary>
+        /// 热区高度
+        /// </summary>
         public int height { get; set; }
 
+        /// <summary>
+        /// 热区宽度
+        /// </summary>
         public int width { get; set; }
 
+        /// <summary>
+        /// 热区左
+        /// </summary>
         public int left { get; set; }
 
+        /// <summary>
+        /// 热区上
+        /// </summary>
         public int top { get; set; }
 
+        /// <summary>
+        /// 开始点X
+        /// </summary>
         public int defaultX { get; set; }
 
+        /// <summary>
+        /// 开始点Y
+        /// </summary>
         public int defaultY { get; set; }
 
+        /// <summary>
+        /// 是否关闭
+        /// </summary>
         public bool is_close { get; set; }
 
+        /// <summary>
+        /// 热区链接
+        /// </summary>
         public rubikLinkItem link { get; set; }
 
+        /// <summary>
+        /// 打开方式
+        /// </summary>
         public string open_type { get; set; }
     }
 
@@ -743,7 +823,56 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 商品列表
         /// </summary>
-        public List<GoodsDetailsItem> list { get; set; }
+        public List<GoodsDetailsItem2> list { get; set; }
+    }
+
+    /// <summary>
+    /// 商品详情项
+    /// </summary>
+    public class GoodsDetailsItem2
+    {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 商品图片
+        /// </summary>
+        public string CoverImage { get; set; }
+
+        /// <summary>
+        /// 售价
+        /// </summary>
+        public decimal SellingPrice { get; set; }
+
+        public int SalesNum { get; set; }
+
+        /// <summary>
+        /// 商品分类列表
+        /// </summary>
+        public List<CategoryItem> CategoryList { get; set; }
+    }
+
+    /// <summary>
+    /// 商品分类
+    /// </summary>
+    public class CategoryItem
+    { 
+        /// <summary>
+        /// 商品分类编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 商品分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
     }
 
     /// <summary>

Mall.Model/Extend/User/RB_Mall_Magic_Extend.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 图片魔方表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Mall_Magic_Extend : Model.Entity.User.RB_Mall_Magic
+    {
+        /// <summary>
+        /// 魔方数据列表
+        /// </summary>
+        public List<MagicItem> MagicDataList { get; set; }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateDateStr
+        {
+            get
+            {
+                string str = "";
+                if (this.CreateDate != null)
+                {
+                    str = Convert.ToDateTime(this.CreateDate).ToString("yyyy-MM-dd HH:mm:ss");
+                }
+                return str;
+            }
+        }
+    }
+
+    /// <summary>
+    /// 魔方数据项
+    /// </summary>
+    public class MagicItem
+    {
+        /// <summary>
+        /// 魔方链接
+        /// </summary>
+        public string Link { get; set; }
+
+        /// <summary>
+        /// 魔方图片
+        /// </summary>
+        public string ImgUrl { get; set; }
+    }
+}
\ No newline at end of file

Mall.Model/Extend/User/RB_Mall_Nav_Extend.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 轮播图表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Mall_Nav_Extend : Model.Entity.User.RB_Mall_Nav
+    {
+    }
+}
\ No newline at end of file

Mall.Model/Extend/User/RB_Menu_Extend.cs

@@ -27,5 +27,10 @@ namespace Mall.Model.Extend.User
                 return str;
             }
         }
+
+        /// <summary>
+        /// 查询菜单编号
+        /// </summary>
+        public string QMenuIds { get; set; }
     }
 }

Mall.Model/Extend/User/RB_MiniProgram_Extend.cs

@@ -93,6 +93,112 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string[] JumpAppIdList { get; set; }
 
-     
+        /// <summary>
+        /// 小程序首页数据
+        /// </summary>
+        public List<HomeItem> HomeDataList { get; set; }
+    }
+
+    /// <summary>
+    /// 首页数据项
+    /// </summary>
+    public class HomeItem
+    { 
+        /// <summary>
+        /// 插件Key
+        /// </summary>
+       public string key { get; set; }
+
+        /// <summary>
+        /// 插件名称
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 关系Id
+        /// </summary>
+        public int relation_id { get; set; }
+
+        /// <summary>
+        /// 是否可编辑[0-不可编辑,1-可编辑]
+        /// </summary>
+        public int is_edit { get; set; }
+
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string imgBg { get; set; }
+
+        /// <summary>
+        /// 图标一行显示个数【导航图标插件】
+        /// </summary>
+        public int row_num { get; set; }
+
+        /// <summary>
+        /// 插件permission_key【video、topic、coupon】
+        /// </summary>
+        public string permission_key { get; set; }
+
+        /// <summary>
+        /// 视频地址【视频插件、】
+        /// </summary>
+        public string video_url { get; set; }
+
+        /// <summary>
+        /// 视频封面图【视频插件、】
+        /// </summary>
+        public string video_pic_url { get; set; }
+
+        /// <summary>
+        /// 公告图片地址【公告插件】
+        /// </summary>
+        public string notice_url { get; set; }
+
+        /// <summary>
+        /// 公告背景颜色【公告插件】
+        /// </summary>
+        public string notice_bg_color { get; set; }
+
+        /// <summary>
+        /// 公告文字颜色【公告插件】
+        /// </summary>
+        public string notice_text_color { get; set; }
+
+        /// <summary>
+        /// 专题显示数量【专题插件】
+        /// </summary>
+        public int topic_num { get; set; }
+
+        /// <summary>
+        /// 图标(1个专题)【专题插件】
+        /// </summary>
+        public string topic_url { get; set; }
+
+        /// <summary>
+        /// 图标(2个专题)【专题插件】
+        /// </summary>
+        public string topic_url_2 { get; set; }
+
+        /// <summary>
+        /// 专题标签图片【专题插件】
+        /// </summary>
+        public string label_url { get; set; }
+
+        /// <summary>
+        /// 已领取图
+        /// </summary>
+        public string coupon_url { get; set; }
+
+        /// <summary>
+        /// 未领取图（满减券）
+        /// </summary>
+        public string coupon_not_url { get; set; }
+
+        /// <summary>
+        /// 打折券未认领
+        /// </summary>
+        public string discount_not_url { get; set; }
+
     }
+ 
 }

Mall.Model/Extend/User/RB_Role_Extend.cs

@@ -30,5 +30,10 @@ namespace Mall.Model.Entity.User
         /// 创建人
         /// </summary>
         public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public int EmpId { get; set; }
     }
 }
\ No newline at end of file

Mall.Model/Extend/User/RB_Tenant_Extend.cs

@@ -34,5 +34,15 @@ namespace Mall.Model.Extend.User
                 return str;
             }
         }
+
+        /// <summary>
+        /// 小程序Id【用于登录验证】
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 当前登录员工编号
+        /// </summary>
+        public int EmpId { get; set; }
     }
 }

Mall.Module.User/EmployeeModule.cs

@@ -53,6 +53,16 @@ namespace Mall.Module.User
             return roleRepository.GetRoleListRepository(query);
         }
 
+        /// <summary>
+        /// 根据员工编号获取角色权限
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Role_Extend> GetRoleListExtModule(RB_Role_Extend query)
+        {
+            return roleRepository.GetRoleListExtRepository(query);
+        }
+
         /// <summary>
         /// 新增修改角色
         /// </summary>

Mall.Module.User/MiniProgramModule.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 using Mall.Common.Plugin;
 using NPOI.SS.Formula.Functions;
+using Mall.Repository.User;
 
 namespace Mall.Module.User
 {
@@ -46,6 +47,187 @@ namespace Mall.Module.User
         /// </summary>
         private Repository.AppletWeChat.RB_Live_HouseRepository liveHouseRepository = new Repository.AppletWeChat.RB_Live_HouseRepository();
 
+        /// <summary>
+        /// 轮播图表仓储层对象
+        /// </summary>
+        private RB_Mall_NavRepository navRepository = new RB_Mall_NavRepository();
+
+        /// <summary>
+        /// 图片魔方表仓储层对象
+        /// </summary>
+        private RB_Mall_MagicRepository magicRepository = new RB_Mall_MagicRepository();
+
+        #region 轮播图管理
+        /// <summary>
+        /// 轮播图分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Mall_Nav_Extend> GetMallNavPageListModule(int pageIndex, int pageSize, out long rowCount, RB_Mall_Nav_Extend query)
+        {
+            return navRepository.GetMallNavPageListRepository(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 获取轮播图列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Mall_Nav_Extend> GetMallNavListModule(RB_Mall_Nav_Extend query)
+        {
+            return navRepository.GetMallNavListRepository(query);
+        }
+
+        /// <summary>
+        /// 添加修改轮播图
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMallNavModule(RB_Mall_Nav_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_Mall_Nav_Extend.NavName),extModel.NavName.Trim()},
+                    { nameof(RB_Mall_Nav_Extend.NavLink),extModel.NavLink},
+                    { nameof(RB_Mall_Nav_Extend.NavImg),extModel.NavImg},
+                };
+                flag = navRepository.Update(fileds, new WhereHelper(nameof(RB_Mall_Nav_Extend.Id), extModel.Id));
+            }
+            else
+            {
+                int NewId = navRepository.Insert(extModel);
+                extModel.Id = NewId;
+                flag = NewId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取轮播图实体
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public RB_Mall_Nav_Extend GetMallNavModule(object Id)
+        {
+            var extModel = navRepository.GetEntity<RB_Mall_Nav_Extend>(Id);
+            if (extModel == null)
+            {
+                extModel = new RB_Mall_Nav_Extend();
+            }
+            return extModel;
+        }
+
+        /// <summary>
+        /// 删除轮播图
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveMallNavModule(object Id)
+        {
+            bool flag = false;
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_Mall_Nav_Extend.Status),1},
+            };
+            flag = navRepository.Update(fileds, new WhereHelper(nameof(RB_Mall_Nav_Extend.Id), Id));
+            return flag;
+        }
+
+        #endregion
+
+        #region 图片魔方管理
+        /// <summary>
+        /// 图片魔方分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Mall_Magic_Extend> GetMallMagicPageListModule(int pageIndex, int pageSize, out long rowCount, RB_Mall_Magic_Extend query)
+        {
+            return magicRepository.GetMallMagicPageListRepository(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 获取图片魔方列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Mall_Magic_Extend> GetMallMagicListModule(RB_Mall_Magic_Extend query)
+        {
+            return magicRepository.GetMallMagicListRepository(query);
+        }
+
+        /// <summary>
+        /// 添加修改图片魔方
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMallMagicModule(RB_Mall_Magic_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_Mall_Magic_Extend.Name),extModel.Name.Trim()},
+                    { nameof(RB_Mall_Magic_Extend.Style),extModel.Style},
+                    { nameof(RB_Mall_Magic_Extend.MagicData),extModel.MagicData},
+                };
+                flag = magicRepository.Update(fileds, new WhereHelper(nameof(RB_Mall_Magic_Extend.Id), extModel.Id));
+            }
+            else
+            {
+                int NewId = magicRepository.Insert(extModel);
+                extModel.Id = NewId;
+                flag = NewId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取图片魔方实体
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public RB_Mall_Magic_Extend GetMallMagicModule(object Id)
+        {
+            var extModel = magicRepository.GetEntity<RB_Mall_Magic_Extend>(Id);
+            if (extModel == null)
+            {
+                extModel = new RB_Mall_Magic_Extend();
+            }
+            if (extModel.MagicData != null && !string.IsNullOrEmpty(extModel.MagicData))
+            {
+                extModel.MagicDataList = Common.Plugin.JsonHelper.DeserializeObject<List<MagicItem>>(extModel.MagicData);
+            }
+            return extModel;
+        }
+
+        /// <summary>
+        /// 删除图片魔方
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveMallMagicModule(object Id)
+        {
+            bool flag = false;
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_Mall_Magic_Extend.Status),1},
+            };
+            flag = magicRepository.Update(fileds, new WhereHelper(nameof(RB_Mall_Magic_Extend.Id), Id));
+            return flag;
+        }
+        #endregion
+
         #region 小程序
 
         /// <summary>
@@ -219,8 +401,9 @@ namespace Mall.Module.User
         /// <param name="MallBaseId">小程序Id</param>
         /// <param name="isGetNav">是否获取顶部底部配置+底部标签导航(0-不获取,1-获取)</param>
         /// <param name="isGetUserCenterMenu">是否获取用户中心菜单</param>
+        /// <param name="isGetHomeData">是否获取首页配置数据</param>
         /// <returns></returns>
-        public RB_MiniProgram_Extend GetMiniProgramModule(object MallBaseId, int isGetNav = 0, bool isGetUserCenterMenu = false)
+        public RB_MiniProgram_Extend GetMiniProgramModule(object MallBaseId, int isGetNav = 0, bool isGetUserCenterMenu = false,bool isGetHomeData=false)
         {
             RB_MiniProgram_Extend extModel = programRepository.GetEntity<RB_MiniProgram_Extend>(MallBaseId);
             if (extModel == null)
@@ -246,6 +429,13 @@ namespace Mall.Module.User
                     extModel.SelfMenuList = menuList?.Where(qitem => qitem.MenuType == 4)?.ToList();
                 }
             }
+            if (isGetHomeData)
+            {
+                if (extModel.MallHomeData != null && !string.IsNullOrEmpty(extModel.MallHomeData))
+                {
+                    extModel.HomeDataList = Common.Plugin.JsonHelper.DeserializeObject<List<HomeItem>>(extModel.MallHomeData);
+                }
+            }
             return extModel;
         }
 
@@ -285,6 +475,24 @@ namespace Mall.Module.User
             return flag;
         }
 
+        /// <summary>
+        /// 修改小程序首页布局
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiniProgramMallHomeModule(RB_MiniProgram_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.MallBaseId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_Extend.MallHomeData),extModel.MallHomeData},
+                };
+                flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), extModel.MallBaseId));
+            }
+            return flag;
+        }
 
 
         /// <summary>
@@ -507,7 +715,6 @@ namespace Mall.Module.User
 
         #endregion
 
-
         #region 微信小程序基础配置
 
 
@@ -572,9 +779,6 @@ namespace Mall.Module.User
 
         #endregion
 
-
-
-
         #region 发送小程序订阅信息
 
 
@@ -1522,7 +1726,6 @@ namespace Mall.Module.User
 
         #endregion
 
-
         #region 小程序直播房间信息
 
 

Mall.Module.User/TenantModule.cs

@@ -27,6 +27,16 @@ namespace Mall.Module.User
             return tenantRepository.GetListRepository(query);
         }
 
+        /// <summary>
+        /// 根据小程序获取商户信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Tenant_Extend GetTenantByMallModule(RB_Tenant_Extend query)
+        {
+            return tenantRepository.GetTenantByMallRepository(query);
+        }
+
         /// <summary>
         /// 获取商户分页列表
         /// </summary>

Mall.Repository/User/RB_Mall_MagicRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 图片魔方表仓储层
+    /// </summary>
+    public class RB_Mall_MagicRepository : RepositoryBase<RB_Mall_Magic>
+    {
+        /// <summary>
+        /// 图片魔方分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Mall_Magic_Extend> GetMallMagicPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Mall_Magic_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT * FROM RB_Mall_Magic WHERE 1=1 AND Status=0 ");
+            if (query.TenantId > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Magic_Extend.TenantId), query.TenantId);
+            }
+            if (query.MallBaseId > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Magic_Extend.MallBaseId), query.MallBaseId);
+            }
+            if (query.Id > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Magic_Extend.Id), query.Id);
+            }
+            if (query.Name != null && !string.IsNullOrEmpty(query.Name.Trim()))
+            {
+                builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Mall_Magic_Extend.Name), query.Name.Trim());
+            }
+            return GetPage<RB_Mall_Magic_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取图片魔方列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Mall_Magic_Extend> GetMallMagicListRepository(RB_Mall_Magic_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT * FROM RB_Mall_Magic WHERE 1=1 AND Status=0 ");
+            if (query.TenantId > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Magic_Extend.TenantId), query.TenantId);
+            }
+            if (query.MallBaseId > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Magic_Extend.MallBaseId), query.MallBaseId);
+            }
+            if (query.Id > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Magic_Extend.Id), query.Id);
+            }
+            if (query.Name != null && !string.IsNullOrEmpty(query.Name.Trim()))
+            {
+                builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Mall_Magic_Extend.Name), query.Name.Trim());
+            }
+            return Get<RB_Mall_Magic_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_Mall_NavRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 轮播图表仓储层
+    /// </summary>
+    public class RB_Mall_NavRepository : RepositoryBase<RB_Mall_Nav>
+    {
+        /// <summary>
+        /// 轮播图分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Mall_Nav_Extend> GetMallNavPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Mall_Nav_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT * FROM RB_Mall_Nav WHERE 1=1 AND Status=0 ");
+            if (query.TenantId > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Nav_Extend.TenantId), query.TenantId);
+            }
+            if (query.MallBaseId > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Nav_Extend.MallBaseId), query.MallBaseId);
+            }
+            if (query.Id > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Nav_Extend.Id), query.Id);
+            }
+            if (query.NavName != null && !string.IsNullOrEmpty(query.NavName.Trim()))
+            {
+                builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Mall_Nav_Extend.NavName), query.NavName.Trim());
+            }
+            return GetPage<RB_Mall_Nav_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取轮播图列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Mall_Nav_Extend> GetMallNavListRepository(RB_Mall_Nav_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT * FROM RB_Mall_Nav WHERE 1=1 AND Status=0 ");
+            if (query.TenantId > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Nav_Extend.TenantId), query.TenantId);
+            }
+            if (query.MallBaseId > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Nav_Extend.MallBaseId), query.MallBaseId);
+            }
+            if (query.Id > 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Mall_Nav_Extend.Id), query.Id);
+            }
+            if (query.NavName != null && !string.IsNullOrEmpty(query.NavName.Trim()))
+            {
+                builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Mall_Nav_Extend.NavName), query.NavName.Trim());
+            }
+            return Get<RB_Mall_Nav_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_MenuRepository.cs

@@ -31,10 +31,16 @@ namespace Mall.Repository.User
                 {
                     builder.AppendFormat(" AND MenuName LIKE '%{0}%' ", query.MenuName.Trim());
                 }
+                if (query.QMenuIds != null && !string.IsNullOrEmpty(query.QMenuIds.Trim()))
+                {
+                    builder.AppendFormat(" AND MenuId IN({0}) ", query.QMenuIds.Trim());
+                }
             }
             return Get<RB_Menu_Extend>(builder.ToString()).ToList();
         }
 
+
+
         /// <summary>
         /// 获取菜单分页列表
         /// </summary>

Mall.Repository/User/RB_RoleRepository.cs

@@ -71,5 +71,21 @@ namespace Mall.Repository.User
             }
             return Get<RB_Role_Extend>(builder.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 根据员工编号获取角色权限
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Role_Extend> GetRoleListExtRepository(RB_Role_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" 
+SELECT group_concat(RoleAuth) AS RoleAuth 
+FROM rb_role 
+WHERE `Status`=0  AND RoleId IN (SELECT group_concat(RoleAuth) AS RoleAuth FROM rb_employee WHERE empId={0} )
+",query.EmpId);
+            return Get<RB_Role_Extend>(builder.ToString()).ToList();
+        }
     }
 }
\ No newline at end of file

Mall.Repository/User/RB_TenantRepository.cs

@@ -31,6 +31,29 @@ namespace Mall.Repository.User
             return Get<RB_Tenant_Extend>(builder.ToString()).ToList();
         }
 
+        /// <summary>
+        /// 根据小程序获取商户信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Tenant_Extend GetTenantByMallRepository(RB_Tenant_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@"
+SELECT A.TenantId,B.EmpAccount AS Account,A.Name,A.MobilePhone,A.WeChatNum,A.IsEffective,A.AccountValidate,A.CreateMiniPrograme
+        ,A.AccountStatus,B.EmpPwd AS Password,B.EmpId
+FROM RB_Tenant AS A  LEFT JOIN rb_employee AS B ON A.TenantId=B.TenantId
+WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Account != null && !string.IsNullOrEmpty(query.Account.Trim()))
+                {
+                    builder.AppendFormat(" AND B.EmpAccount='{0}' ", query.Account.Trim());
+                }
+            }
+            return Get<RB_Tenant_Extend>(builder.ToString()).FirstOrDefault();
+        }
+
         /// <summary>
         /// 获取商户分页列表
         /// </summary>

Mall.WebApi/Controllers/ByteDance/ByteDanceController.cs

@@ -234,29 +234,6 @@ namespace Mall.WebApi.Controllers.ByteDance
             proc.Close();
 
             return output;
-
-            //////using (var process = new System.Diagnostics.Process())
-            //////{
-            //////    process.StartInfo.FileName = "cmd.exe cd  'D:\\Tool\\bytedance\\bytedanceide\\resources\\app.asar.unpacked\\bytecli.bat'";//后面的 \"D:\\ServKit\"替换为你需要的路径即可。
-            //////                                                                                                                                              // process.StartInfo.FileName = "cmd.exe";
-            //////    process.StartInfo.UseShellExecute = false;
-            //////    process.StartInfo.RedirectStandardInput = true;
-            //////    process.StartInfo.RedirectStandardOutput = true;
-            //////    process.StartInfo.RedirectStandardError = true;
-            //////    process.StartInfo.CreateNoWindow = true;
-            //////    process.StartInfo.StandardOutputEncoding = Encoding.UTF8;
-            //////    process.Start();
-            //////    process.StandardInput.AutoFlush = true;
-            //////    process.StandardInput.WriteLine(cmdline + "&exit");
-
-            //////    //获取cmd窗口的输出信息  
-            //////    string output = process.StandardOutput.ReadToEnd();
-
-            //////    process.WaitForExit();
-            //////    process.Close();
-
-            //////    return output;
-            //////}
         }
 
     }

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -403,6 +403,7 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", list);
         }
 
+
         /// <summary>
         /// 获取分类详情
         /// </summary>

Mall.WebApi/Mall.WebApi.csproj

@@ -4,10 +4,6 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Controllers\ByteDance\ByteDanceController.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Remove="web.config" />
   </ItemGroup>
@@ -29,9 +25,5 @@
     <ProjectReference Include="..\Mall.ThirdCore\Mall.ThirdCore.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Controllers\ByteDance\" />
-  </ItemGroup>
-
 
 </Project>