Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Common/API/AppletUserInfo.cs

@@ -151,5 +151,15 @@ namespace Mall.Common
         /// 是否管理员  1是
         /// </summary>
         public int IsAdmin { get; set; }
+
+        /// <summary>
+        /// 小程序管理员编号
+        /// </summary>
+        public int AdminId { get; set; }
+
+        /// <summary>
+        /// 后台Token
+        /// </summary>
+        public string AdminToken { get; set; }
     }
 }
\ No newline at end of file

Mall.Common/Plugin/WeiXinHelper.cs

@@ -276,7 +276,7 @@ namespace Mall.Common.Plugin
         public string priTmplId { get; set; }
 
         /// <summary>
-        /// 	模版标题
+        /// 模版标题
         /// </summary>
         public string title { get; set; }
 

Mall.Model/Entity/User/RB_Member_Group.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 用户分组实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Member_Group
+    {
+        /// <summary>
+        /// 分组编号(主键)
+        /// </summary>
+        public int GroupId { get; set; }
+
+        /// <summary>
+        /// 可查看分组编号
+        /// </summary>
+        public string LookGroupIds { get; set; }
+
+        /// <summary>
+        /// 分组名称
+        /// </summary>
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// 是否默认分组(1-是)
+        /// </summary>
+        public int IsDefault { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+    }
+}

Mall.Model/Entity/User/RB_Member_Look.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 用户查看微信日志实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public  class RB_Member_Look
+    {
+		/// <summary>
+		/// 用户查看微信日志Id
+		/// </summary>
+		public int LookId { get; set; }
+
+		/// <summary>
+		/// 用户编号
+		/// </summary>
+		public int UserId { get; set; }
+
+		/// <summary>
+		/// 商户号id
+		/// </summary>
+		public int TenantId { get; set; }
+
+		/// <summary>
+		/// 小程序id
+		/// </summary>
+		public int MallBaseId { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateDate { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 修改时间
+		/// </summary>
+		public DateTime UpdateDate { get; set; }
+	}
+}

Mall.Model/Entity/User/RB_Member_User.cs

@@ -230,13 +230,11 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public string PhoneNum { get; set; }
 
-
         /// <summary>
         /// 是否结算用户，1-是  2020-11-10  Addd By:w
         /// </summary>
         public int IsSettlement { get; set; }
 
-
         /// <summary>
         /// 教育点数（针对购买直播产品）
         /// </summary>
@@ -251,5 +249,20 @@ namespace Mall.Model.Entity.User
         /// 是否管理员  1是
         /// </summary>
         public int IsAdmin { get; set; }
+
+        /// <summary>
+        /// 是否显示用户资料(1-显示，0-不显示)
+        /// </summary>
+        public int IsShow { get; set; }
+
+        /// <summary>
+        /// 用户所属分组
+        /// </summary>
+        public string BelongGroupIds { get; set; }
+
+        /// <summary>
+        /// 查看次数
+        /// </summary>
+        public int LookTimes { get; set; }
     }
 }

Mall.Model/Entity/User/RB_Miniprogram_Admin.cs

+using Mall.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 小程序管理员实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miniprogram_Admin
+    {
+		/// <summary>
+		/// 管理员编号
+		/// </summary>
+		public int AdminId { get; set; }
+
+		/// <summary>
+		/// 用户编号(rb_member_user表中的Id)
+		/// </summary>
+		public int UserId { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 商户号
+		/// </summary>
+		public int TenantId { get; set; }
+
+		/// <summary>
+		/// 小程序id
+		/// </summary>
+		public int MallBaseId { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateDate { get; set; }
+
+		/// <summary>
+		/// 修改时间
+		/// </summary>
+		public DateTime UpdateDate { get; set; }
+	}
+}

Mall.Model/Extend/User/RB_Member_Group_Extend.cs

+using Mall.Model.Entity.User;
+using System.Collections.Generic;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 用户分组扩展实体类
+    /// </summary>
+    public class RB_Member_Group_Extend: RB_Member_Group
+    {
+        /// <summary>
+        /// 分组编号
+        /// </summary>
+        public string Q_GroupIds { get; set; }
+
+        /// <summary>
+        /// 可查看分组列表
+        /// </summary>
+        public List<object> LookGroupList { get; set; }
+
+        /// <summary>
+        /// 可查询分组编号
+        /// </summary>
+        public List<int> GroupIdList
+        {
+            get
+            {
+                List<int> ids = new List<int>();
+                if (!string.IsNullOrEmpty(this.LookGroupIds))
+                {
+                    ids = Common.ConvertHelper.StringToList(this.LookGroupIds);
+                }
+                return ids;
+            }
+        }
+
+        /// <summary>
+        /// 是否查询默认分组
+        /// </summary>
+        public int IsQueryDefault { get; set; }
+    }
+}

Mall.Model/Extend/User/RB_Member_Look_Extend.cs

+using Mall.Model.Entity.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 用户查看微信日志扩展实体类
+    /// </summary>
+    public class RB_Member_Look_Extend: RB_Member_Look
+    {
+    }
+}

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -149,8 +149,6 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string Icon { get; set; }
 
-
-
         /// <summary>
         /// 是否赞羊使用0-否，1-是
         /// </summary>
@@ -202,18 +200,44 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public int Gender { get; set; }
 
-    }
+        /// <summary>
+        /// 管理员编号
+        /// </summary>
+        public int AdminId { get; set; }
 
+        /// <summary>
+        /// 用户所属分组
+        /// </summary>
+        public List<int> BelongGroupIdList
+        {
+            get
+            {
+                return Common.ConvertHelper.StringToList(this.BelongGroupIds);
+            }
+        }
+
+    }
 
+    /// <summary>
+    /// 相亲用户扩展实体类
+    /// </summary>
     public class RB_Member_MiaiUser_Extend : RB_Member_User
     {
-
+        /// <summary>
+        /// 微信号
+        /// </summary>
         public string WechatNo { get; set; }
+
         /// <summary>
         /// 导出枚举ids
         /// </summary>
         public List<int> ExcelEnumIds { get; set; }
+
+        /// <summary>
+        /// 生日
+        /// </summary>
         public string Birthday { get; set; }
+
         /// <summary>
         /// 年龄
         /// </summary>
@@ -278,6 +302,7 @@ namespace Mall.Model.Extend.User
         /// 开始时间
         /// </summary>
         public string StartTime { get; set; }
+
         /// <summary>
         /// 结束时间
         /// </summary>
@@ -293,9 +318,14 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string SuperiorName { get; set; }
 
-
+        /// <summary>
+        /// 性别(1-男，2-女)
+        /// </summary>
         public int Sex { get; set; }
 
+        /// <summary>
+        /// 用户编号
+        /// </summary>
         public string UserIds { get; set; }
 
         /// <summary>
@@ -303,10 +333,43 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public int IsFaTie { get; set; }
 
+        /// <summary>
+        /// 基础信息编号
+        /// </summary>
         public int BaseInfoId { get; set; }
+
+        /// <summary>
+        /// 查询分组
+        /// </summary>
+        public List<int> Q_BelongGroup_Ids { get; set; }
+
+        /// <summary>
+        /// 用户所属分组
+        /// </summary>
+        public List<GroupItem> BelongGroupList { get; set; }
+
+        /// <summary>
+        /// 用户查看分组
+        /// </summary>
+        public List<GroupItem> LookGroupList { get; set; }
     }
 
 
+    /// <summary>
+    /// 组别项
+    /// </summary>
+    public class GroupItem
+    { 
+       /// <summary>
+       /// 分组编号
+       /// </summary>
+      public int GroupId { get; set; }
+
+        /// <summary>
+        /// 分组名称
+        /// </summary>
+        public string GroupName { get; set; }
+    }
 
 
     /// <summary>
@@ -333,5 +396,6 @@ namespace Mall.Model.Extend.User
         /// 客户编号
         /// </summary>
         public int UserID { get; set; }
+
     }
 }

Mall.Model/Extend/User/RB_Miniprogram_Admin_Extend.cs

+using Mall.Common.Enum.User;
+using Mall.Model.Entity.User;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 小程序管理员扩展实体类
+    /// </summary>
+    public class RB_Miniprogram_Admin_Extend: RB_Miniprogram_Admin
+    {
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
+
+        /// <summary>
+        /// 手机号码
+        /// </summary>
+        public string Moblie { get; set; }
+
+        /// <summary>
+        /// 昵称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// OpenId
+        /// </summary>
+        public string OpenId { get; set; }
+
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public UserSourceEnum Source { get; set; }
+    }
+}

Mall.Module.User/MemberGroupModule.cs

+using Mall.Common.Enum;
+using Mall.Model.Extend.User;
+using Mall.Repository.User;
+using System.Collections.Generic;
+using VT.FW.DB;
+using System.Linq;
+
+namespace Mall.Module.User
+{
+    /// <summary>
+    /// 用户分组处理类
+    /// </summary>
+    public class MemberGroupModule
+    {
+        /// <summary>
+        /// 用户分组仓储层对象
+        /// </summary>
+        private readonly RB_Member_GroupRepository member_GroupRepository = new RB_Member_GroupRepository();
+
+        /// <summary>
+        /// 获取用户分组分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Member_Group_Extend> GetMemberGroupPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Member_Group_Extend query)
+        {
+            var list= member_GroupRepository.GetMemberGroupPageRepository(pageIndex, pageSize, out rowsCount, query);
+            if (list != null && list.Count > 0)
+            {
+                string groupIds = string.Join(",", list.Select(qitem => qitem.LookGroupIds));
+                List<int> idList = Common.ConvertHelper.StringToList(groupIds);
+                var groupList = GetMemberGroupListModule(new RB_Member_Group_Extend()
+                {
+                    Q_GroupIds = string.Join(",", idList)
+                });
+                foreach (var item in list)
+                {
+                    item.LookGroupList = new List<object>();
+                    if (item.GroupIdList != null && item.GroupIdList.Count > 0)
+                    {
+                        foreach (var sItem in item.GroupIdList)
+                        {
+                            var tempGroup = groupList.Where(qitem => qitem.GroupId == sItem)?.FirstOrDefault();
+                            if (tempGroup != null && tempGroup.GroupId > 0)
+                            {
+                                item.LookGroupList.Add(new
+                                {
+                                    tempGroup.GroupId,
+                                    tempGroup.GroupName,
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 获取用户分组列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Member_Group_Extend> GetMemberGroupListModule(RB_Member_Group_Extend query)
+        {
+            return member_GroupRepository.GetMemberGroupListRepository(query);
+        }
+
+        /// <summary>
+        /// 新增修改用户分组
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetMemberGroupModule(RB_Member_Group_Extend model)
+        {
+            bool flag;
+            if (model.GroupId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Member_Group_Extend.GroupName),model.GroupName },
+                    {nameof(RB_Member_Group_Extend.LookGroupIds),model.LookGroupIds },
+                    {nameof(RB_Member_Group_Extend.UpdateBy),model.UpdateBy },
+                    {nameof(RB_Member_Group_Extend.UpdateDate),model.UpdateDate },
+                };
+                flag = member_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Member_Group_Extend.GroupId), model.GroupId));
+            }
+            else
+            {
+                var newId = member_GroupRepository.Insert(model);
+                model.GroupId = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取用户分组实体
+        /// </summary>
+        /// <param name="GroupId"></param>
+        /// <returns></returns>
+        public RB_Member_Group_Extend GetMemberGroupModule(object GroupId)
+        {
+            var model = member_GroupRepository.GetEntity<RB_Member_Group_Extend>(GroupId);
+            return model;
+        }
+
+        /// <summary>
+        /// 设置默认分组
+        /// </summary>
+        /// <param name="GroupId"></param>
+        /// <param name="MallBaseId"></param>
+        /// <returns></returns>
+        public bool SetDefaultGroupModule(int GroupId,int MallBaseId)
+        {
+            bool flag = member_GroupRepository.UpdateIsDefaultRepository(MallBaseId);
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Member_Group_Extend.IsDefault),1 }
+            };
+            flag = member_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Member_Group_Extend.GroupId), GroupId));
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号删除用户分组
+        /// </summary>
+        /// <param name="GroupId"></param>
+        /// <returns></returns>
+        public bool RemoveMemberGroupModule(object GroupId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Member_Group_Extend.Status),(int)DateStateEnum.Delete },
+            };
+            bool flag = member_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Member_Group_Extend.GroupId), GroupId));
+            return flag;
+        }
+    }
+}

Mall.Module.User/MemberLookModule.cs

+using Mall.Model.Extend.User;
+using Mall.Repository.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Module.User
+{
+   /// <summary>
+   /// 用户查看微信日志处理类
+   /// </summary>
+   public class MemberLookModule
+    {
+        /// <summary>
+        /// 用户查看微信日志仓储层对象
+        /// </summary>
+        private readonly RB_Member_LookRepository member_LookRepository = new RB_Member_LookRepository();
+
+        /// <summary>
+        /// 获取用户查看微信日志分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Member_Look_Extend> GetMemberLookPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Member_Look_Extend query)
+        {
+            return member_LookRepository.GetMemberLookPageRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 获取用户查看日志列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Member_Look_Extend> GetMemberLookListModule(RB_Member_Look_Extend query)
+        {
+            return member_LookRepository.GetMemberLookListRepository(query);
+        }
+
+        /// <summary>
+        /// 新增用户查看日志
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool AddMemberLookModule(RB_Member_Look_Extend model)
+        {
+            var newId = member_LookRepository.Insert(model);
+            model.LookId = newId;
+            return newId > 0;
+        }
+    }
+}

Mall.Module.User/MiniProgramModule.cs

@@ -2153,13 +2153,28 @@ namespace Mall.Module.User
         #region 首页统计
 
         /// <summary>
-        /// 获取商城的总订单和总用户
+        /// 首页数据统计
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public MallIndexStatistics GetMallUserAndOrderModule(StatisticsQuery query)
-        {
-            return mallStatisticsRepository.GetMallUserAndOrderRepository(query);
+        public object GetMallIndexDataModule(StatisticsQuery query)
+        {
+            //首页基础数据统计
+            var basicData = MallIndexStatisticsModule(query);
+            //销售情况统计
+            var salesData = MallIndexSalesStatisticsModule(query);
+            //商品购买力TOP排行
+            var saleIncomeData =MallIndesSalesIncomeStatisticsModule(query);
+            //用户购买力TOP排行
+            var saleUserData = MallIndesSalesUserStatisticsModule(query);
+            var obj = new
+            {
+                basicData,
+                salesData,
+                saleIncomeData,
+                saleUserData
+            };
+            return obj;
         }
 
         /// <summary>
@@ -2167,7 +2182,7 @@ namespace Mall.Module.User
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public MallIndexStatistics MallIndexStatisticsModule(StatisticsQuery query)
+        private MallIndexStatistics MallIndexStatisticsModule(StatisticsQuery query)
         {
             return mallStatisticsRepository.MallIndexStatisticsRepository(query);
         }
@@ -2176,7 +2191,7 @@ namespace Mall.Module.User
         /// 销售情况统计
         /// </summary>
         /// <param name="query"></param>
-        public object MallIndexSalesStatisticsModule(StatisticsQuery query)
+        private object MallIndexSalesStatisticsModule(StatisticsQuery query)
         {
             var list = mallStatisticsRepository.MallIndexSalesStatisticsRepository(query);
             List<object> resultList = new List<object>();
@@ -2228,6 +2243,18 @@ namespace Mall.Module.User
             return obj;
         }
 
+
+        /// <summary>
+        /// 获取商城的总订单和总用户
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public MallIndexStatistics GetMallUserAndOrderModule(StatisticsQuery query)
+        {
+           return mallStatisticsRepository.GetMallUserAndOrderRepository(query);
+        }
+
+
         /// <summary>
         /// 商品购买力TOP排行
         /// </summary>

Mall.Module.User/MiniprogramAdminModule.cs

+using Mall.Common.Enum;
+using Mall.Model.Extend.User;
+using Mall.Repository.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Module.User
+{
+    /// <summary>
+    /// 小程序管理员
+    /// </summary>
+    public class MiniprogramAdminModule
+    {
+        /// <summary>
+        /// 小程序管理员仓储层对象
+        /// </summary>
+        private readonly RB_Miniprogram_AdminRepository miniprogram_AdminRepository = new RB_Miniprogram_AdminRepository();
+
+        /// <summary>
+        /// 获取管理员分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_Admin_Extend> GetMiniprogramAdminPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Miniprogram_Admin_Extend query)
+        {
+            return miniprogram_AdminRepository.GetMiniprogramAdminPageRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 检查用户是否存在
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool CheckExistsAdminModule(RB_Miniprogram_Admin_Extend model)
+        {
+            var oldModel = miniprogram_AdminRepository.GetMiniprogramAdminEntityRepository(new RB_Miniprogram_Admin_Extend()
+            {
+                TenantId = model.TenantId,
+                MallBaseId = model.MallBaseId,
+                UserId = model.UserId
+            });
+            var flag= oldModel?.AdminId > 0;
+            return flag;
+        }
+
+        /// <summary>
+        /// 新增修改小程序管理员
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetMiniprogramAdminModule(RB_Miniprogram_Admin_Extend model)
+        {
+            bool flag;
+            var oldModel = miniprogram_AdminRepository.GetMiniprogramAdminEntityRepository(new RB_Miniprogram_Admin_Extend()
+            {
+                TenantId = model.TenantId,
+                MallBaseId = model.MallBaseId,
+                UserId = model.UserId
+            });
+            model.AdminId = oldModel?.AdminId ?? 0;
+            if (model.AdminId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Miniprogram_Admin_Extend.UpdateDate),model.UpdateDate }
+                };
+                flag = miniprogram_AdminRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_Admin_Extend.AdminId),model.AdminId));
+            }
+            else
+            {
+                var newId = miniprogram_AdminRepository.Insert(model);
+                model.AdminId = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号删除管理员
+        /// </summary>
+        /// <param name="AdminId"></param>
+        /// <returns></returns>
+        public bool RemoveMiniprogramAdminModule(int AdminId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Miniprogram_Admin_Extend.Status),(int)DateStateEnum.Delete }
+            };
+            bool flag = miniprogram_AdminRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_Admin_Extend.AdminId), AdminId));
+            return flag;
+        }
+    }
+}
\ No newline at end of file

Mall.Module.User/UserModule.cs

@@ -5524,26 +5524,31 @@ namespace Mall.Module.User
         public object GetHpDistributorGoodsInfo(string categoryIds, decimal costPrice, int tenantId, int mallBaseId)
         {
             //判断是否开启和平返佣
-            List<WhereHelper> wheres = new List<WhereHelper>() {
-                new WhereHelper(){
-                        FiledName=nameof(RB_Distributor_HPCommission_Extend.Status),
-                        FiledValue=0,
-                        OperatorEnum=OperatorEnum.Equal
+            List<WhereHelper> wheres = new List<WhereHelper>()
+            {
+                new WhereHelper()
+                {
+                    FiledName=nameof(RB_Distributor_HPCommission_Extend.Status),
+                    FiledValue=0,
+                    OperatorEnum=OperatorEnum.Equal
                 },
-                new WhereHelper(){
-                        FiledName=nameof(RB_Distributor_HPCommission_Extend.Enabled),
-                        FiledValue=1,
-                        OperatorEnum=OperatorEnum.Equal
+                new WhereHelper()
+                {
+                    FiledName=nameof(RB_Distributor_HPCommission_Extend.Enabled),
+                    FiledValue=1,
+                    OperatorEnum=OperatorEnum.Equal
                 },
-                new WhereHelper(){
-                        FiledName=nameof(RB_Distributor_HPCommission_Extend.TenantId),
-                        FiledValue=tenantId,
-                        OperatorEnum=OperatorEnum.Equal
+                new WhereHelper()
+                {
+                    FiledName=nameof(RB_Distributor_HPCommission_Extend.TenantId),
+                    FiledValue=tenantId,
+                    OperatorEnum=OperatorEnum.Equal
                 },
-                new WhereHelper(){
-                        FiledName=nameof(RB_Distributor_HPCommission_Extend.MallBaseId),
-                        FiledValue=mallBaseId,
-                        OperatorEnum=OperatorEnum.Equal
+                new WhereHelper()
+                {
+                    FiledName=nameof(RB_Distributor_HPCommission_Extend.MallBaseId),
+                    FiledValue=mallBaseId,
+                    OperatorEnum=OperatorEnum.Equal
                 }
             };
             if (!distributor_HPCommissionRepository.Exists(wheres))

Mall.Repository/User/RB_Member_GroupRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 用户分组仓储层
+    /// </summary>
+    public class RB_Member_GroupRepository : BaseRepository<RB_Member_Group>
+    {
+        /// <summary>
+        /// 获取用户分组分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Member_Group_Extend> GetMemberGroupPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Member_Group_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_Member_Group AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.GroupName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @GroupName ", nameof(RB_Member_Group_Extend.GroupName));
+                    parameters.Add("GroupName", "%" + query.GroupName.Trim() + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Member_Group_Extend.GroupId));
+            return GetPage<RB_Member_Group_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 获取用户分组列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Member_Group_Extend> GetMemberGroupListRepository(RB_Member_Group_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_Member_Group AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.GroupName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @GroupName ", nameof(RB_Member_Group_Extend.GroupName));
+                    parameters.Add("GroupName", "%" + query.GroupName.Trim() + "%");
+                }
+                if (!string.IsNullOrEmpty(query.Q_GroupIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Member_Group_Extend.GroupId), query.Q_GroupIds);
+                }
+                if (query.IsQueryDefault == 1)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.IsDefault), 1);
+                }
+            }
+            return Get<RB_Member_Group_Extend>(builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 修改默认分组
+        /// </summary>
+        /// <param name="MallBaseId"></param>
+        /// <returns></returns>
+        public bool UpdateIsDefaultRepository(int MallBaseId)
+        {
+            string sql = string.Format(" UPDATE RB_Member_Group SET IsDefault=0 WHERE MallBaseId={0} ", MallBaseId);
+            return base.Execute(sql)>0;
+        }
+    }
+}

Mall.Repository/User/RB_Member_LookRepository.cs

+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 用户查看微信日志仓储层
+    /// </summary>
+    public class RB_Member_LookRepository:BaseRepository<RB_Member_Look>
+    {
+        /// <summary>
+        /// 获取用户查看微信日志分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Member_Look_Extend> GetMemberLookPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Member_Look_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_Member_Look AS A
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Member_Look_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Member_Look_Extend.MallBaseId), query.MallBaseId);
+                }
+            }
+            return GetPage<RB_Member_Look_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取用户查看日志列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Member_Look_Extend> GetMemberLookListRepository(  RB_Member_Look_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_Member_Look AS A
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Member_Look_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Member_Look_Extend.MallBaseId), query.MallBaseId);
+                }
+            }
+            return Get<RB_Member_Look_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -609,9 +609,7 @@ select * from RB_Member_User where {where} order by CreateDate desc
                     where += $@" and {nameof(RB_Member_User.SmallShopId)}=0";
                 }
             }
-
-
-
+ 
             if (!string.IsNullOrEmpty(dmodel.UserIds))
             {
                 where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})";
@@ -870,54 +868,59 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use
         /// <returns></returns>
         public RB_Member_User_Extend GetMemberUserEntityRepository(RB_Member_User_Extend query)
         {
-            string where = " 1=1 ";
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.UserId,0) AS AdminId 
+FROM RB_Member_User AS A LEFT JOIN rb_miniprogram_admin AS B ON A.Id=B.UserId
+WHERE 1=1 
+");
             if (query.TenantId > 0)
             {
-                where += $@" and {nameof(RB_Member_User.TenantId)}={query.TenantId}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.TenantId)}={query.TenantId}");
             }
             if (query.MallBaseId > 0)
             {
-                where += $@" and {nameof(RB_Member_User.MallBaseId)}={query.MallBaseId}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.MallBaseId)}={query.MallBaseId}");
             }
             if (query.Id > 0)
             {
-                where += $@" and {nameof(RB_Member_User.Id)}={query.Id}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.Id)}={query.Id}");
             }
             if (!string.IsNullOrEmpty(query.Name))
             {
-                where += $@" and {nameof(RB_Member_User.Name)} like '%{query.Name}%'";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.Name)} like '%{query.Name}%' ");
             }
             if (!string.IsNullOrEmpty(query.AliasName))
             {
-                where += $@" and {nameof(RB_Member_User.AliasName)} like '%{query.AliasName}%'";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.AliasName)} like '%{query.AliasName}%'");
             }
             if (query.Source > 0)
             {
-                where += $@" and {nameof(RB_Member_User.Source)} ={(int)query.Source}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.Source)} ={(int)query.Source}");
             }
             if (!string.IsNullOrEmpty(query.Moblie))
             {
-                where += $@" and {nameof(RB_Member_User.Moblie)} like '%{query.Moblie}%'";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.Moblie)} like '%{query.Moblie}%'");
             }
             if (query.MemberGrade > 0)
             {
-                where += $@" and {nameof(RB_Member_User.MemberGrade)}={query.MemberGrade}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.MemberGrade)}={query.MemberGrade}");
             }
             if (query.SuperiorId > 0)
             {
-                where += $@" and {nameof(RB_Member_User.SuperiorId)}={query.SuperiorId}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.SuperiorId)}={query.SuperiorId}");
             }
             if (query.IsEmptyUserPhoto == 1)
             {
-                where += $@" and IFNULL({nameof(RB_Member_User.Photo)},'')=''";
+                builder.AppendFormat($@" and IFNULL(A.{nameof(RB_Member_User.Photo)},'')=''");
             }
             //HK06-01新增查询条件
             if (query.OpenId != null && !string.IsNullOrWhiteSpace(query.OpenId))
             {
-                where += $@" and {nameof(RB_Member_User.OpenId)} LIKE '{query.OpenId}%'";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.OpenId)} LIKE '{query.OpenId}%'");
             }
-            string sql = $@"select * from RB_Member_User where {where} ";
-            return Get<RB_Member_User_Extend>(sql).FirstOrDefault();
+         
+            return Get<RB_Member_User_Extend>(builder.ToString()).FirstOrDefault();
         }
 
         #endregion
@@ -1355,28 +1358,32 @@ FROM
                 where += $@" and t.{nameof(RB_Member_MiaiUser_Extend.EducationType)} ={(int)dmodel.EducationType}";
             }
 
-
-            //if (dmodel.IsEmptyUserPhoto == 1)
-            //{
-            //    where += $@" and IFNULL(a.{nameof(RB_Member_User.Photo)},'')=''";
-            //}
             //HK06-01新增查询条件
             if (dmodel.OpenId != null && !string.IsNullOrWhiteSpace(dmodel.OpenId))
             {
                 where += $@" and t.{nameof(RB_Member_User.OpenId)} = '%{dmodel.OpenId}%'";
             }
-            //if (dmodel.IsSelectCommpany == 1)
-            //{
-            //    where += $@" and a.{nameof(RB_Member_User.Id)} between 5 and 100 ";
-            //}
+            if (dmodel.Q_BelongGroup_Ids != null && dmodel.Q_BelongGroup_Ids.Count > 0)
+            {
+                string tempStr = "";
+                for (var i = 0; i < dmodel.Q_BelongGroup_Ids.Count; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempStr += " OR ";
+                    }
+                    tempStr += string.Format(" FIND_IN_SET('{0}',t.BelongGroupIds) ", dmodel.Q_BelongGroup_Ids[i]);
+                }
+                if (!string.IsNullOrWhiteSpace(tempStr))
+                {
+                    where += string.Format(" AND ({0}) ", tempStr);
+                }
+            }
+         
             string orderBy = "t.CreateDate desc";
-            //if (dmodel.MinUserId > 0)
-            //{
-            //    where += $@" and a.{nameof(RB_Member_User.Id)}>{dmodel.MinUserId}";
-            //    orderBy = "a.Id asc";
-            //}
+       
             string sql = $@"
-SELECT * from (SELECT	a.*,mu.`Name` as SuperiorName,b.WechatNo, b.Id as BaseInfoId,b.Album,b.Birthday,b.Height,b.IsFaTie,b.Weight,b.YearMoney,b.EducationType,b.Marriage,b.CarInfo,b.HouseInfo,(YEAR (curdate()) - YEAR (b.Birthday) - 1 + (	DATE_FORMAT(b.Birthday, '%m%d') <= (	DATE_FORMAT(curdate(), '%m%d')	)	)) Age
+SELECT * from (SELECT a.*,mu.`Name` as SuperiorName,b.WechatNo, b.Id as BaseInfoId,b.Album,b.Birthday,b.Height,b.IsFaTie,b.Weight,b.YearMoney,b.EducationType,b.Marriage,b.CarInfo,b.HouseInfo,(YEAR (curdate()) - YEAR (b.Birthday) - 1 + (	DATE_FORMAT(b.Birthday, '%m%d') <= (	DATE_FORMAT(curdate(), '%m%d')	)	)) Age
 FROM RB_Member_User AS a LEFT JOIN rb_miai_baseinfo AS b ON a.Id = b.UserId LEFT JOIN rb_member_user as mu on a.SuperiorId=mu.Id) as t   where {where} order by {orderBy}
 ";
             return GetPage<RB_Member_MiaiUser_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
@@ -1871,5 +1878,19 @@ GROUP BY u.Id)t";
             return obj == null ? 0 : Convert.ToInt32(obj);
         }
         #endregion
+
+
+        /// <summary>
+        /// 批量修改用户分组
+        /// </summary>
+        /// <param name="BelongGroupIds"></param>
+        /// <param name="UserIds"></param>
+        /// <returns></returns>
+        public bool BatchUpdateMemberGroupRepository(string BelongGroupIds, string UserIds)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(" UPDATE rb_member_user SET BelongGroupIds='{0}' WHERE Id IN({1}) ", BelongGroupIds, UserIds);
+            return base.Execute(builder.ToString()) > 0;
+        }
     }
 }

Mall.Repository/User/RB_Miniprogram_AdminRepository.cs

+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using Mall.Common.Enum;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 小程序管理员仓储层
+    /// </summary>
+    public class RB_Miniprogram_AdminRepository:BaseRepository<RB_Miniprogram_Admin>
+    {
+        /// <summary>
+        /// 获取管理员分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_Admin_Extend> GetMiniprogramAdminPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Miniprogram_Admin_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,B.Photo,B.Moblie,B.`Name`,B.OpenId,B.Source
+FROM rb_miniprogram_admin AS A LEFT JOIN rb_member_user AS B ON A.UserId=B.Id
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat($@" and B.{nameof(RB_Miniprogram_Admin_Extend.Name)} like @Name ");
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                }
+                if (query.Source > 0)
+                {
+                    builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.Source), (int)query.Source);
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Miniprogram_Admin_Extend.AdminId));
+            return GetPage<RB_Miniprogram_Admin_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取管理员实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Miniprogram_Admin_Extend GetMiniprogramAdminEntityRepository( RB_Miniprogram_Admin_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,B.Photo,B.Moblie,B.`Name`,B.OpenId,B.Source
+FROM rb_miniprogram_admin AS A LEFT JOIN rb_member_user AS B ON A.UserId=B.Id
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat($@" and B.{nameof(RB_Miniprogram_Admin_Extend.Name)} like @Name ");
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                }
+                if (query.Source > 0)
+                {
+                    builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.Source), (int)query.Source);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.UserId), query.UserId);
+                }
+            }
+            return Get<RB_Miniprogram_Admin_Extend>(builder.ToString(), parameters)?.FirstOrDefault();
+        }
+    }
+}

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -2612,7 +2612,7 @@ namespace Mall.WebApi.Controllers.Education
             var Id = parms.GetInt("Id", 0);
             var ApplyForCancelStatus = parms.GetInt("ApplyForCancelStatus", 0);//申请取消审核状态  1同意  2拒绝
             var RejectRemark = parms.GetStringValue("RejectRemark");//拒绝备注
-            bool flag = false;
+            bool flag;
             if (Id <= 0)
             {
                 return ApiResult.ParamIsNull("请传递");

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -28,6 +28,12 @@ namespace Mall.WebApi.Controllers.MallBase
     {
         private readonly MiaiModule miaiModule = new MiaiModule();
         private readonly Module.Education.PointModule pointModule = new Module.Education.PointModule();
+
+        /// <summary>
+        /// 用户查看微信日志处理类
+        /// </summary>
+        private readonly MemberLookModule memberLookModule = new MemberLookModule();
+
         #region 活动版块
         /// <summary>
         /// 获取活动版块分页列表
@@ -525,7 +531,6 @@ namespace Mall.WebApi.Controllers.MallBase
 
         #endregion
 
-
         #region 星星商品
         [HttpPost]
         public ApiResult GetStarsGoodsPageList()
@@ -776,7 +781,6 @@ namespace Mall.WebApi.Controllers.MallBase
 
         #endregion
 
-
         #region 会员中心
         /// <summary>
         /// 获取用户分页列表
@@ -810,6 +814,12 @@ namespace Mall.WebApi.Controllers.MallBase
                 YearMoney = param.GetInt("YearMoney"),
                 EndYearMoney = param.GetInt("EndYearMoney"),
             };
+            var groupIds = param.GetStringValue("GroupIdList");
+            if (!string.IsNullOrEmpty(groupIds))
+            {
+                var idList = JsonHelper.DeserializeObject<List<int>>(groupIds);
+                demodel.Q_BelongGroup_Ids = idList;
+            }
             demodel.TenantId = Convert.ToInt32(parms.uid);
             demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetMemberUserPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
@@ -858,7 +868,11 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.IsFaTie,
                 x.SuperiorName,
                 x.SuperiorId,
-                x.BaseInfoId
+                x.BaseInfoId,
+                x.IsShow,
+                x.LookTimes,
+                x.LookGroupList,
+                x.BelongGroupList,
             }); ;
             return ApiResult.Success("", pagelist);
         }
@@ -1073,7 +1087,6 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull();
             }
-
             var model = miaiModule.GetMemberUserInfo(UserId);
             if (model.TenantId != Convert.ToInt32(requestParm.uid))
             {
@@ -1184,11 +1197,13 @@ namespace Mall.WebApi.Controllers.MallBase
                 DWProvince = oldBaseInfo.DWProvince ?? 0,
                 DWCity = oldBaseInfo.DWCity ?? 0,
                 DWDistrict = oldBaseInfo.DWDistrict ?? 0,
+                model.IsShow,
+                model.BelongGroupIds,
+                model.BelongGroupIdList,
+                model.LookTimes,
             });
         }
-
-
-
+ 
         /// <summary>
         /// 后台更新用户信息
         /// </summary>
@@ -1197,7 +1212,30 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult SetMemberUserInfoForHT()
         {
             var parms = RequestParm;
-            RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(parms.msg.ToString());
+            var jobj = JObject.Parse(parms.msg.ToString());
+            RB_Member_User_Extend demodel = new RB_Member_User_Extend()
+            {
+                Id=jobj.GetInt("Id"),
+                MemberGrade=jobj.GetInt("MemberGrade"),
+                SuperiorId=jobj.GetInt("SuperiorId"),
+                ContactWay=jobj.GetStringValue("ContactWay"),
+                Remark=jobj.GetStringValue("Remark"),
+                AliasName=jobj.GetStringValue("AliasName"),
+                UpdateDate=DateTime.Now,
+                PostId=jobj.GetInt("PostId"),
+                Name=jobj.GetStringValue("Name"),
+                Photo=jobj.GetStringValue("Photo"),
+                Blacklist=jobj.GetInt("Blacklist"),
+                IsShow=jobj.GetInt("IsShow"),
+                LookTimes=jobj.GetInt("LookTimes"),
+            };
+            List<int> groupIds = new List<int>();
+            if (!string.IsNullOrEmpty(jobj.GetStringValue("BelongGroupIdList")))
+            {
+                groupIds = JsonHelper.DeserializeObject<List<int>>(jobj.GetStringValue("BelongGroupIdList"));
+            }
+            demodel.BelongGroupIds = string.Join(",", groupIds);
+
             RB_MiAi_BaseInfo_Extend baseInfo = JsonConvert.DeserializeObject<RB_MiAi_BaseInfo_Extend>(parms.msg.ToString());
             if (demodel.Id <= 0)
             {
@@ -1252,10 +1290,7 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Failed("请选择定位省市区");
             }
-            //if (baseInfo.YearMoney == 0)
-            //{
-            //    return ApiResult.Failed("请输入年收入");
-            //}
+    
             if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
             {
                 return ApiResult.Failed("请选择学历");
@@ -1300,6 +1335,25 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
+        /// <summary>
+        /// 批量修改用户分组
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult BatchSetMemberGroup()
+        {
+            var jobj = JObject.Parse(RequestParm.msg.ToString());
+            string userIds = jobj.GetStringValue("UserIds");
+            List<int> groupIds = new List<int>();
+            if (!string.IsNullOrEmpty(jobj.GetStringValue("BelongGroupIdList")))
+            {
+                groupIds = JsonHelper.DeserializeObject<List<int>>(jobj.GetStringValue("BelongGroupIdList"));
+            }
+            string BelongGroupIds = string.Join(",", groupIds);
+            bool flag= miaiModule.BatchSetMemberGroupModule(BelongGroupIds, userIds);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
 
         /// <summary>
         /// 更新用户的发帖权限
@@ -1344,6 +1398,27 @@ namespace Mall.WebApi.Controllers.MallBase
 
 
 
+        #endregion
+
+        #region 用户查看微信日子处理类
+
+        /// <summary>
+        /// 获取用户分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetWechatLog()
+        {
+             
+            JObject param = JObject.Parse(RequestParm.msg.ToString());
+            var model = new RB_Member_Look_Extend()
+            {
+
+            };
+          // memberLookModule.AddMemberLookModule()
+            return ApiResult.Success();
+        }
+
         #endregion
 
     }

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -43,6 +43,9 @@ namespace Mall.WebApi.Controllers.User
         private readonly Module.Education.ActivityModule activityModule = new Module.Education.ActivityModule();
 
         private readonly Module.Reserve.ReserveModule reserveModule = new Module.Reserve.ReserveModule();
+
+        private readonly Module.User.MemberGroupModule memberGroupModule = new MemberGroupModule();
+
         #region 小程序登录
         /// <summary>
         /// 登录注册
@@ -77,6 +80,8 @@ namespace Mall.WebApi.Controllers.User
                 CounponPassword = parms.GetInt("CounponPassword", 3),
                 KeyWord = parms.GetStringValue("KeyWord"),
                 EduSchoolId = parms.GetInt("EduSchoolId", 0),
+                IsShow = 1,
+                LookTimes = 5,
             };
             if (requestParm.TenantId <= 0)
             {
@@ -94,8 +99,22 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.ParamIsNull("请传递唯一码");
             }
+            //查询用户默认分组
+            var groupModel = memberGroupModule.GetMemberGroupListModule(new RB_Member_Group_Extend()
+            {
+                TenantId = requestParm.TenantId,
+                MallBaseId = requestParm.MallBaseId,
+                IsQueryDefault = 1
+            })?.FirstOrDefault();
+            if (groupModel != null && groupModel.GroupId > 0)
+            {
+                demodel.BelongGroupIds = groupModel?.GroupId.ToString();
 
-            //int LoginUserId = 0;
+            }
+            else
+            {
+                demodel.BelongGroupIds = "";
+            }
             bool IsLogin = false;
             var opcache = UserReidsCache.GetMiniAppUsetOpenId(demodel.OpenId);
             if (opcache != null && !string.IsNullOrEmpty(opcache.UserOpenId))
@@ -106,24 +125,6 @@ namespace Mall.WebApi.Controllers.User
             else
             {
                 IsLogin = true;
-                //if (string.IsNullOrEmpty(requestParm.token))
-                //{
-                //    return ApiResult.ParamIsNull("请传递唯一码");
-                //}
-                //else
-                //{
-                //    LoginUserId = JWTValidatGetUserId(requestParm.token);
-                //    if (LoginUserId <= 0)
-                //    {
-                //        return ApiResult.ParamIsNull("请传递唯一码");
-                //    }
-                //    var loginModel = UserReidsCache.GetAppletUserLoginInfo(LoginUserId);
-                //    demodel.OpenId = loginModel?.OpenId ?? "";
-                //    if (string.IsNullOrEmpty(demodel.OpenId))
-                //    {
-                //        return ApiResult.ParamIsNull("请传递唯一码");
-                //    }
-                //}
             }
 
             Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend couponResult = new Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend();
@@ -291,11 +292,8 @@ namespace Mall.WebApi.Controllers.User
                     {
                         return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
                     }
-
                 }
-
                 return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
-                //  return ApiResult.Failed("注册失败，请联系管理员");
             }
             else
             {
@@ -304,7 +302,6 @@ namespace Mall.WebApi.Controllers.User
                 if (umodel == null)
                 {
                     return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
-                    // return ApiResult.Failed("未能查询到用户信息");
                 }
                 if (umodel.Blacklist == 1)
                 {
@@ -352,8 +349,17 @@ namespace Mall.WebApi.Controllers.User
                     UserTeacher = (teacher != null && teacher.ID > 0) ? teacher.ID : 0,
                     IsAddBaseInfo = 0,
                     IsOpenMiAi = mmodel.IsOpenMiAi,
-                    IsAdmin = umodel.IsAdmin
+                    IsAdmin = umodel.IsAdmin,
+                    AdminId=umodel.AdminId,
                 };
+                if (umodel.AdminId > 0)
+                {
+                    appletUserInfo.AdminToken = ApiTokenHelper.CreateToken(new TokenUserInfo()
+                    {
+                         requestFrom= ApiRequestFromEnum.Web,
+                         uid= umodel.TenantId.ToString(),
+                    });
+                }
                 if (mmodel.IsOpenMiAi == 1)
                 {
                     var oldBaseInfo = miaiModule.GetBaseInfoList(new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend { UserId = umodel.Id, TenantId = mmodel.TenantId, MallBaseId = mmodel.MallBaseId }).FirstOrDefault();
@@ -389,9 +395,7 @@ namespace Mall.WebApi.Controllers.User
                         };
                         activityModule.SetEduBaseInfo(eduBaseInfo);
                     }
-
                 }
-
                 UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
                 if (isGiveCoupon)
                 {
@@ -401,9 +405,6 @@ namespace Mall.WebApi.Controllers.User
                 {
                     return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
                 }
-
-                // return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
-                //return ApiResult.Success("", appletUserInfo);
             }
         }
 
@@ -424,7 +425,6 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.ParamIsNull("请传递小程序id");
             }
-
             var appletWeChatModel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = requestParm.MallBaseId });
             if (appletWeChatModel == null)
             {
@@ -448,37 +448,8 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.Failed();
             }
-
-        }
-
-
-
-        /// <summary>
-        /// token校验
-        /// </summary>
-        /// <param name="actionContext"></param>
-        /// <param name="token"></param>
-        private int JWTValidatGetUserId( string token)
-        {
-            int UserID = 0;
-            if (!string.IsNullOrEmpty(token))
-            {
-                //解析token，校验是否失效
-                try
-                {
-                   var user= ApiTokenHelper.ParsingToken(token);
-                   Int32.TryParse((user?.uid ?? "0"), out UserID);
-                }
-                catch (Exception)
-                {
-                    
-                }
-            }
-            return UserID;
         }
 
-
-
         /// <summary>
         /// 登录注册
         /// </summary>
@@ -501,7 +472,15 @@ namespace Mall.WebApi.Controllers.User
                 UserPageType = (Common.Enum.Goods.GoodsPageTypeEnum)parms.GetInt("UserPageType", 0),
                 CounponPassword = parms.GetInt("CounponPassword", 3),
                 KeyWord = parms.GetStringValue("KeyWord"),
+                IsShow=parms.GetInt("IsShow"),
+                LookTimes = parms.GetInt("LookTimes"),
             };
+            List<int> groupIds = new List<int>();
+            if (!string.IsNullOrEmpty(parms.GetStringValue("BelongGroupIdList")))
+            {
+                groupIds = JsonHelper.DeserializeObject<List<int>>(parms.GetStringValue("BelongGroupIdList"));
+            }
+            demodel.BelongGroupIds = string.Join(",", groupIds);
 
             Model.Extend.Miai.RB_MiAi_BaseInfo_Extend baseInfo = JsonConvert.DeserializeObject<Model.Extend.Miai.RB_MiAi_BaseInfo_Extend>(requestParm.msg.ToString());
             if (requestParm.TenantId <= 0)
@@ -543,10 +522,7 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.Failed("请选择身高");
             }
-            //if (baseInfo.YearMoney == 0)
-            //{
-            //    return ApiResult.Failed("请输入年收入");
-            //}
+ 
             if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
             {
                 return ApiResult.Failed("请选择学历");
@@ -588,7 +564,7 @@ namespace Mall.WebApi.Controllers.User
             //验证是否新用户
             if (!userModule.ValidateUserOpenId(demodel.OpenId, demodel.Source, requestParm.TenantId, requestParm.MallBaseId))
             {
-                LogHelper.WriteInfo(demodel.OpenId + "，SuperiorId:" + (demodel.SuperiorId ?? 0));
+            
                 //注册新用户
                 if (string.IsNullOrEmpty(demodel.Name))
                 {
@@ -730,7 +706,7 @@ namespace Mall.WebApi.Controllers.User
                 }
 
                 return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
-                //  return ApiResult.Failed("注册失败，请联系管理员");
+ 
             }
             else
             {
@@ -739,7 +715,7 @@ namespace Mall.WebApi.Controllers.User
                 if (umodel == null)
                 {
                     return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
-                    // return ApiResult.Failed("未能查询到用户信息");
+ ;
                 }
                 if (umodel.Blacklist == 1)
                 {

Mall.WebApi/Controllers/User/TenantController.cs

@@ -1974,21 +1974,8 @@ namespace Mall.WebApi.Controllers.User
             var query = JsonConvert.DeserializeObject<StatisticsQuery>(RequestParm.msg.ToString());
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            //首页基础数据统计
-            var basicData = programModule.MallIndexStatisticsModule(query);
-            //销售情况统计
-            var salesData = programModule.MallIndexSalesStatisticsModule(query);
-            //商品购买力TOP排行
-            var saleIncomeData = programModule.MallIndesSalesIncomeStatisticsModule(query);
-            //用户购买力TOP排行
-            var saleUserData = programModule.MallIndesSalesUserStatisticsModule(query);
-            var obj = new
-            {
-                basicData,
-                salesData,
-                saleIncomeData,
-                saleUserData
-            };
+ 
+            var obj = programModule.GetMallIndexDataModule(query);
             return ApiResult.Success(data: obj);
         }
 

Mall.WebApi/Controllers/User/UserController.cs

@@ -40,8 +40,21 @@ namespace Mall.WebApi.Controllers.User
             _accessor = accessor;
         }
 
+        /// <summary>
+        /// 小程序用户处理类
+        /// </summary>
         private readonly UserModule userModule = new UserModule();
 
+        /// <summary>
+        /// 小程序管理员处理类
+        /// </summary>
+        private readonly MiniprogramAdminModule adminModule = new MiniprogramAdminModule();
+
+        /// <summary>
+        /// 用户分组处理类对象
+        /// </summary>
+        private readonly MemberGroupModule memberGroupModule = new MemberGroupModule();
+
         #region 用户管理
         /// <summary>
         /// 获取用户分页列表
@@ -876,6 +889,105 @@ namespace Mall.WebApi.Controllers.User
 
         #endregion
 
+        #region 小程序管理员
+        /// <summary>
+        /// 获取小程序管理员分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMiniprogramAdminPage()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Miniprogram_Admin_Extend demodel = new RB_Miniprogram_Admin_Extend()
+            {
+                UserId = parms.GetInt("UserId"),
+                Name=parms.GetStringValue("Name"),
+                Source=(UserSourceEnum)parms.GetInt("Source"),
+            };
+            demodel.TenantId = Convert.ToInt32(RequestParm.uid);
+            demodel.MallBaseId = RequestParm.MallBaseId;
+            var list = adminModule.GetMiniprogramAdminPageModule(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.AdminId,
+                x.UserId,
+                x.Photo,
+                x.Name,
+                x.Moblie,
+                x.OpenId,
+                x.Source,
+                SourceName=x.Source.GetEnumName(),
+                CreateDate= Common.ConvertHelper.FormatTime(x.CreateDate),
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 新增修改小程序管理员
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMiniprogramAdmin()
+        {
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            RB_Miniprogram_Admin_Extend demodel = new RB_Miniprogram_Admin_Extend()
+            {
+                AdminId = parms.GetInt("AdminId"),
+                CreateDate = DateTime.Now,
+                MallBaseId = RequestParm.MallBaseId,
+                TenantId = RequestParm.TenantId,
+                Status = Common.Enum.DateStateEnum.Normal,
+                UpdateDate = DateTime.Now,
+                UserId = parms.GetInt("UserId"),
+            };
+            if (demodel.UserId <= 0)
+            {
+                return ApiResult.ParamIsNull(message:"请选择小程序用户!");
+            }
+            if (adminModule.CheckExistsAdminModule(demodel))
+            {
+                return ApiResult.Failed(message:"已存在此用户!");
+            }
+
+            bool flag = adminModule.SetMiniprogramAdminModule(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 删除小程序管理员
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DeleteMiniprogramAdmin()
+        {
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            var AdminId = parms.GetInt("AdminId");
+            if (AdminId <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请选择小程序用户!");
+            }
+            bool flag = adminModule.RemoveMiniprogramAdminModule(AdminId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        #endregion
+
         #region 分销商基础
 
         /// <summary>
@@ -2406,7 +2518,6 @@ namespace Mall.WebApi.Controllers.User
         }
         #endregion
 
-
         #region 用户转移
 
         /// <summary>
@@ -3539,5 +3650,137 @@ namespace Mall.WebApi.Controllers.User
                 UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             }));
         }
+
+
+        #region 用户分组管理
+        /// <summary>
+        /// 获取用户分组分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMemberGroupPage()
+        {
+            var parms = RequestParm;
+            JObject param = JObject.Parse(parms.msg.ToString());
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Member_Group_Extend demodel = new RB_Member_Group_Extend()
+            {
+                GroupName = param.GetStringValue("GroupName"),
+            };
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = memberGroupModule.GetMemberGroupPageModule(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            List<object> result = new List<object>();
+            if (list != null && list.Count > 0)
+            {
+                foreach (var item in list)
+                {
+                    result.Add(new
+                    {
+                         item.GroupId,
+                         item.GroupName,
+                         item.LookGroupIds,
+                         item.GroupIdList,
+                         item.LookGroupList,
+                         item.IsDefault,
+                         CreateDate = Common.ConvertHelper.FormatTime(item.CreateDate),
+                    });
+                }
+            }
+            pagelist.pageData = result;
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取用户分组下拉列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMemberGroupList()
+        {
+            var parms = RequestParm;
+            JObject param = JObject.Parse(parms.msg.ToString());
+            RB_Member_Group_Extend demodel = new RB_Member_Group_Extend()
+            {
+                GroupName = param.GetStringValue("GroupName"),
+            };
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = memberGroupModule.GetMemberGroupListModule(demodel);
+            return ApiResult.Success("", list);
+        }
+
+
+        /// <summary>
+        /// 获取用户分组信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMemberGroup()
+        {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            RB_Member_Group_Extend model = new RB_Member_Group_Extend()
+            {
+                GroupId= parms.GetInt("GroupId", 0),
+                GroupName=parms.GetStringValue("GroupName"),
+            };
+            var GroupIdList = new List<int>();
+            if (!string.IsNullOrEmpty(parms.GetStringValue("GroupIdList")))
+            {
+                GroupIdList = JsonHelper.DeserializeObject<List<int>>(parms.GetStringValue("GroupIdList"));
+            }
+            model.LookGroupIds = string.Join(",", GroupIdList);
+            model.TenantId = requestParm.TenantId;
+            model.MallBaseId = requestParm.MallBaseId;
+            model.Status = Common.Enum.DateStateEnum.Normal;
+            model.CreateBy = requestParm.TenantId;
+            model.CreateDate = DateTime.Now;
+            model.UpdateBy = requestParm.TenantId;
+            model.UpdateDate = DateTime.Now;
+            var flag = memberGroupModule.SetMemberGroupModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取用户分组信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMemberGroup()
+        {
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int GroupId = parms.GetInt("GroupId", 0);
+            var model = memberGroupModule.GetMemberGroupModule(GroupId);
+            return ApiResult.Success(data: model);
+        }
+
+        /// <summary>
+        /// 设置默认分组
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetDefaultGroup()
+        {
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int GroupId = parms.GetInt("GroupId", 0);
+            var model = memberGroupModule.SetDefaultGroupModule(GroupId, RequestParm.MallBaseId);
+            return ApiResult.Success(data: model);
+        }
+
+        /// <summary>
+        /// 删除用户分组信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DeleteMemberGroup()
+        {
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int GroupId = parms.GetInt("GroupId", 0);
+            var flag = memberGroupModule.RemoveMemberGroupModule(GroupId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/appsettings.json

 {
     "ConnectionStrings": {
-        "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+        "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
         "DefaultConnectionPName": "MySql.Data.MySqlClient",
         "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
         "FinanceConnectionPName": "MySql.Data.MySqlClient",