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

Mall.Model/Entity/Miai/RB_Miai_Activity.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Miai
+{
+    /// <summary>
+    /// 活动表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miai_Activity
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 版块id
+        /// </summary>
+        public int ForumId { get; set; }
+
+        /// <summary>
+        /// 活动名称
+        /// </summary>        
+        public string ActivityTitle
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 活动内容
+        /// </summary>
+        public string Content { get; set; }
+
+        /// <summary>
+        /// 图片列表
+        /// </summary>
+        public string Images { get; set; }
+
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 报名截止日期
+        /// </summary>
+        public DateTime Deadline { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { 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 DateTime UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Miai/RB_Miai_ActivityDiscuss.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Miai
+{
+    /// <summary>
+    /// 活动评论表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miai_ActivityDiscuss
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 活动id
+        /// </summary>
+        public int ActivityId { get; set; }
+
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string Content { get; set; }
+
+        /// <summary>
+        /// 图片列表
+        /// </summary>
+        public string Images { get; set; }
+
+        /// <summary>
+        /// 回复内容id  1级=0
+        /// </summary>
+        public int ParentId { get; set; }
+
+        /// <summary>
+        /// 回复用户id
+        /// </summary>
+        public int ReplyUserId { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { 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 DateTime UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Miai/RB_Miai_ActivityEnroll.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Miai
+{
+    /// <summary>
+    /// 活动表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miai_ActivityEnroll
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 活动id
+        /// </summary>
+        public int ActivityId { get; set; }
+
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { 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 DateTime UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/TradePavilion/RB_Commerce_ActivityType.cs

@@ -23,6 +23,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string TypeName { get; set; }
 
+        /// <summary>
+        /// 封面图
+        /// </summary>
+        public string CoverImage { get; set; }
+
         /// <summary>
         /// 商户号id
         /// </summary>

Mall.Model/Entity/TradePavilion/RB_Company.cs

@@ -107,7 +107,7 @@ namespace Mall.Model.Entity.TradePavilion
 		public string ImportCountry { get; set; }
 
 		/// <summary>
-		/// 主要进口类目
+		/// 进口品目
 		/// </summary>
 		public string ImportCategory { get; set; }
 

Mall.Model/Extend/Miai/RB_Miai_ActivityDiscuss_Extend.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Miai;
+
+namespace Mall.Model.Extend.Miai
+{
+    /// <summary>
+    /// 活动评论表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miai_ActivityDiscuss_Extend : RB_Miai_ActivityDiscuss
+    {
+        /// <summary>
+        /// 活动ids
+        /// </summary>
+        public string ActivityIds { get; set; }
+
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string Photo { get; set; }
+
+        /// <summary>
+        /// 回复某人
+        /// </summary>
+        public string ReplyUserName { get; set; }
+
+        /// <summary>
+        /// 回复列表
+        /// </summary>
+        public List<RB_Miai_ActivityDiscuss_Extend> ReplyList { get; set; }
+
+        /// <summary>
+        /// 回复数量
+        /// </summary>
+        public int ReplyNum { get; set; }
+    }
+}

Mall.Model/Extend/Miai/RB_Miai_ActivityEnroll_Extend.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Miai;
+
+namespace Mall.Model.Extend.Miai
+{
+    /// <summary>
+    /// 活动报名表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miai_ActivityEnroll_Extend : RB_Miai_ActivityEnroll
+    {
+        
+
+    }
+}

Mall.Model/Extend/Miai/RB_Miai_Activity_Extend.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Miai;
+
+namespace Mall.Model.Extend.Miai
+{
+    /// <summary>
+    /// 活动表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miai_Activity_Extend : RB_Miai_Activity
+    {
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
+
+        /// <summary>
+        /// 图片列表
+        /// </summary>
+        public List<string> ImageList { get; set; }
+
+        /// <summary>
+        /// 回复数量
+        /// </summary>
+        public int ReplyNum { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs

@@ -8,8 +8,25 @@ namespace Mall.Model.Extend.TradePavilion
     /// <summary>
     /// 商会活动表扩展实体类
     /// </summary>
-    public class RB_Commerce_Activity_Extend: RB_Commerce_Activity
+    public class RB_Commerce_Activity_Extend : RB_Commerce_Activity
     {
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivityTypeName { get; set; }
+
+        /// <summary>
+        /// 开始时间字符串
+        /// </summary>
+        public string StartTimeStr { get { return Common.ConvertHelper.FormatDate(this.StartTime); } }
+
+
+        /// <summary>
+        /// 结束时间字符串
+        /// </summary>
+        public string EndTimeStr { get { return Common.ConvertHelper.FormatDate(this.EndTime); } }
+
+
         /// <summary>
         /// 商会活动详情列表
         /// </summary>

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -111,7 +111,7 @@ namespace Mall.Module.MarketingCenter
             }
             if (extModel.TemplateData != null && !string.IsNullOrEmpty(extModel.TemplateData))
             {
-                extModel.ComponentDataList = JsonHelper.DeserializeObject<List<ComponentItem>>(Common.ConvertHelper.JsonReplaceSign(extModel.TemplateData));
+                extModel.ComponentDataList = JsonHelper.DeserializeObject<List<ComponentItem>>(extModel.TemplateData);
                 if (extModel.ComponentDataList != null && extModel.ComponentDataList.Count > 0)
                 {
                     foreach (var item in extModel.ComponentDataList)
@@ -621,7 +621,8 @@ namespace Mall.Module.MarketingCenter
                     }
                     item.data = storeModel;
                     break;
-
+                //导航-页面
+                case "nav-page": item.data = JsonHelper.DeserializeObject<navItem>(item.data.ToString()); break;
 
             }
         }

Mall.Module.Miai/MiaiModule.cs

@@ -20,6 +20,9 @@ namespace Mall.Module.Miai
     public class MiaiModule
     {
         private readonly RB_Miai_ForumRepository miai_ForumRepository = new RB_Miai_ForumRepository();
+        private readonly RB_Miai_ActivityRepository miai_ActivityRepository = new RB_Miai_ActivityRepository();
+        private readonly RB_Miai_ActivityEnrollRepository miai_ActivityEnrollRepository = new RB_Miai_ActivityEnrollRepository();
+        private readonly RB_Miai_ActivityDiscussRepository miai_ActivityDiscussRepository = new RB_Miai_ActivityDiscussRepository();
 
 
         private readonly RB_MiAi_BaseInfoRepository miai_BaseInfoRepository = new RB_MiAi_BaseInfoRepository();
@@ -41,6 +44,190 @@ namespace Mall.Module.Miai
             return miai_ForumRepository.GetPageList(pageIndex, pageSize, out count, dmodel);
         }
 
+        /// <summary>
+        /// 获取活动版块列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_Forum_Extend> GetForumList(RB_Miai_Forum_Extend demodel)
+        {
+            return miai_ForumRepository.GetList(demodel);
+        }
+
+        /// <summary>
+        /// 保存活动版块
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool SetForumInfo(RB_Miai_Forum_Extend demodel)
+        {
+            if (demodel.Id > 0)
+            {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Miai_Forum_Extend.Name),demodel.Name},
+                    { nameof(RB_Miai_Forum_Extend.Icon),demodel.Icon},
+                    { nameof(RB_Miai_Forum_Extend.Sort),demodel.Sort},
+                    { nameof(RB_Miai_Forum_Extend.IsShow),demodel.IsShow},
+                    { nameof(RB_Miai_Forum_Extend.UpdateDate),demodel.UpdateDate},
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Miai_Forum_Extend.Id),
+                          FiledValue=demodel.Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                bool flag = miai_ForumRepository.Update(keyValues, wheres);
+                return flag;
+            }
+            else {
+                bool flag = miai_ForumRepository.Insert(demodel) > 0;
+                return flag;
+            }
+        }
+
+        /// <summary>
+        /// 设置版块状态
+        /// </summary>
+        /// <param name="forumId"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public bool SetForumState(int forumId, int type)
+        {
+            if (type == 1)
+            {
+                var model = miai_ForumRepository.GetEntity(forumId);
+                if (model == null) { return false; }
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Miai_Forum_Extend.IsShow),model.IsShow==1?2:1},
+                    { nameof(RB_Miai_Forum_Extend.UpdateDate),DateTime.Now},
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Miai_Forum_Extend.Id),
+                          FiledValue=forumId,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                bool flag = miai_ForumRepository.Update(keyValues, wheres);
+                return flag;
+            }
+            else {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Miai_Forum_Extend.Status),1},
+                    { nameof(RB_Miai_Forum_Extend.UpdateDate),DateTime.Now},
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Miai_Forum_Extend.Id),
+                          FiledValue=forumId,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                bool flag = miai_ForumRepository.Update(keyValues, wheres);
+                return flag;
+            }
+        }
+
+        /// <summary>
+        /// 获取活动分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_Activity_Extend> GetActivityPageList(int pageIndex, int pageSize, out long count, RB_Miai_Activity_Extend demodel)
+        {
+            var list = miai_ActivityRepository.GetPageList(pageIndex, pageSize, out count, demodel);
+            if (list.Any())
+            {
+                string ActivityIds = string.Join(",", list.Select(x => x.Id));
+                //查询活动回复数量
+                var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(ActivityIds);
+                foreach (var item in list)
+                {
+                    item.ImageList = new List<string>();
+                    if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]")
+                    {
+                        item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images);
+                    }
+                    item.ReplyNum = rlist.Where(x => x.ActivityId == item.Id).FirstOrDefault()?.ReplyNum ?? 0;
+                }
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 获取活动信息
+        /// </summary>
+        /// <param name="activityId"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public object GetActivityInfo(int activityId, AppletUserInfo userInfo)
+        {
+            var model = miai_ActivityRepository.GetEntity(activityId);
+            if (model == null) { return ""; }
+            //获取活动报名人数
+            int PeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId);
+            //获取当前用户是否已报名
+            bool IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any();
+            //查询活动回复数量
+            var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(activityId.ToString());
+            return new
+            {
+                model.Id,
+                model.ActivityTitle,
+                model.Content,
+                ImageList = !string.IsNullOrEmpty(model.Images) ? JsonConvert.DeserializeObject<List<string>>(model.Images) : new List<string>() { },
+                model.UserId,
+                Deadline = model.Deadline.ToString("yyyy-MM-dd"),
+                CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                PeopleNum,
+                IsEnroll,
+                ReplyNum = rlist.FirstOrDefault()?.ReplyNum ?? 0
+            };
+        }
+
+        /// <summary>
+        /// 获取活动评论分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityDiscuss_Extend> GetActivityDiscussPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityDiscuss_Extend demodel)
+        {
+            demodel.ParentId = -1;//查询主评论
+            var list = miai_ActivityDiscussRepository.GetPageList(pageIndex, pageSize, out count, demodel);
+            if (list.Any()) {
+                //查询评论下  前几条回复记录
+                List<int> PidsList = list.Select(x => x.Id).ToList();
+                var clist = miai_ActivityDiscussRepository.GetActivityDiscussChildList(PidsList, 4);
+                //查询评论回复数量
+                var rlist = miai_ActivityDiscussRepository.GetDiscussReplyNumList(string.Join(",", PidsList));
+                foreach (var item in list) {
+                    item.ReplyList = clist.Where(x => x.ParentId == item.Id).OrderBy(x => x.Id).ToList();
+                    item.ReplyNum = rlist.Where(x => x.ParentId == item.Id).FirstOrDefault()?.ReplyNum ?? 0;
+                }
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 获取评论回复分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityDiscuss_Extend> GetActivityReplyPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityDiscuss_Extend demodel)
+        {
+            var list = miai_ActivityDiscussRepository.GetPageList(pageIndex, pageSize, out count, demodel);
+            return list;
+        }
         #endregion
 
         #region 会员基础信息

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -58,7 +58,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Commerce_Activity_Extend.EndTime),model.EndTime },
                     {nameof(RB_Commerce_Activity_Extend.CoverImg),model.CoverImg },
                     {nameof(RB_Commerce_Activity_Extend.ActivityType),model.ActivityType },
-                    {nameof(RB_Commerce_Activity_Extend.ActivityInfo),model.ActivityType },
+                    {nameof(RB_Commerce_Activity_Extend.ActivityInfo),model.ActivityInfo },
                     {nameof(RB_Commerce_Activity_Extend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Commerce_Activity_Extend.UpdateDate),model.UpdateDate },
                 };
@@ -161,6 +161,16 @@ namespace Mall.Module.TradePavilion
             return activityTypeRepository.GetCommerceActivityTypePageListRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_ActivityType_Extend> GetCommerceActivityTypeListModule(RB_Commerce_ActivityType_Extend query)
+        {
+            return activityTypeRepository.GetCommerceActivityTypeListRepository(query);
+        }
+
         /// <summary>
         /// 新增修改商会活动类型
         /// </summary>
@@ -174,6 +184,7 @@ namespace Mall.Module.TradePavilion
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Commerce_ActivityType_Extend.TypeName),model.TypeName },
+                    {nameof(RB_Commerce_ActivityType_Extend.CoverImage),model.CoverImage },
                     {nameof(RB_Commerce_ActivityType_Extend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Commerce_ActivityType_Extend.UpdateDate),model.UpdateDate }
                 };

Mall.Module.TradePavilion/CompanyModule.cs

@@ -35,6 +35,16 @@ namespace Mall.Module.TradePavilion
             return companyRepository.GetEntity<RB_Company_Extend>(CompanyId);
         }
 
+        /// <summary>
+        /// 获取公司信息实体
+        /// </summary>
+        /// <param name="CompanyId"></param>
+        /// <returns></returns>
+        public RB_Company_Extend GetCompanyByUserIdModule(int userId)
+        {
+            return companyRepository.GetCompanyRepository(new RB_Company_Extend() { CreateBy = userId });
+        }
+
         /// <summary>
         /// 新增修改公司信息
         /// </summary>

Mall.Module.TradePavilion/ContractModule.cs

@@ -30,6 +30,16 @@ namespace Mall.Module.TradePavilion
             return contractRepository.GetContractPageListRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
+        /// <summary>
+        /// 获取联系列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Contract_Extend> GetContractListModule(RB_Contract_Extend query)
+        {
+            return contractRepository.GetContractListRepository(query);
+        }
+
         /// <summary>
         /// 获取联系人实体
         /// </summary>

Mall.Repository/Miai/RB_Miai_ActivityDiscussRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Miai;
+using Mall.Model.Extend.Miai;
+using System.Linq;
+
+namespace Mall.Repository.Miai
+{
+    /// <summary>
+    /// 活动评论仓储层
+    /// </summary>
+    public class RB_Miai_ActivityDiscussRepository : BaseRepository<RB_Miai_ActivityDiscuss>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityDiscuss_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Miai_ActivityDiscuss_Extend dmodel)
+        {
+            string where = $" 1=1 and d.{nameof(RB_Miai_ActivityDiscuss_Extend.Status)}=0 ";
+            if (dmodel.TenantId > 0) {
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.ActivityId > 0) {
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} ={dmodel.ActivityId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.UserId)} ={dmodel.UserId}";
+            }
+            if (dmodel.ParentId > 0)
+            {
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} ={dmodel.ParentId}";
+            }
+            if (dmodel.ParentId == -1)
+            {
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} =0";
+            }
+            string sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+left join rb_member_user u on d.UserId = u.Id
+left join rb_member_user u1 on d.ReplyUserId = u1.Id
+where {where} order by d.Id asc";
+            return GetPage<RB_Miai_ActivityDiscuss_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityDiscuss_Extend> GetList(RB_Miai_ActivityDiscuss_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Miai_ActivityDiscuss_Extend.Status)}=0 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.ActivityId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} ={dmodel.ActivityId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.ActivityIds)) {
+                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} in({dmodel.ActivityIds})";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.UserId)} ={dmodel.UserId}";
+            }
+            if (dmodel.ParentId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} ={dmodel.ParentId}";
+            }
+            string sql = $@"select * from RB_Miai_ActivityDiscuss where {where} order by Id asc";
+            return Get<RB_Miai_ActivityDiscuss_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取子集回复 前几条数据
+        /// </summary>
+        /// <param name="pidsList"></param>
+        /// <param name="number"></param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityDiscuss_Extend> GetActivityDiscussChildList(List<int> pidsList, int number)
+        {
+            int count = pidsList.Count();
+            string sql = "";
+            if (count == 1) {
+                //只有一条数据
+                sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+left join rb_member_user u on d.UserId = u.Id
+left join rb_member_user u1 on d.ReplyUserId = u1.Id
+where d.Status =0 and d.ParentId ={pidsList.FirstOrDefault()} order by d.Id asc limit {number}";
+            }
+            for (var i = 0; i < count; i++) {
+                if (i == count - 1)
+                {
+                    //最后一条
+                    sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+left join rb_member_user u on d.UserId = u.Id
+left join rb_member_user u1 on d.ReplyUserId = u1.Id
+where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id asc limit {number})";
+                }
+                else {
+                    sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+left join rb_member_user u on d.UserId = u.Id
+left join rb_member_user u1 on d.ReplyUserId = u1.Id
+where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id asc limit {number})
+union 
+";
+                }
+            }
+            return Get<RB_Miai_ActivityDiscuss_Extend>(sql).ToList();
+            
+        }
+
+        /// <summary>
+        /// 获取回复数量
+        /// </summary>
+        /// <param name="activityIds"></param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityDiscuss_Extend> GetActivityReplyNumList(string activityIds)
+        {
+            string sql = $@"select ActivityId,count(0) as ReplyNum from RB_Miai_ActivityDiscuss where Status =0 and ActivityId in({activityIds}) group by ActivityId";
+            return Get<RB_Miai_ActivityDiscuss_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取评论回复数量
+        /// </summary>
+        /// <param name="pids"></param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityDiscuss_Extend> GetDiscussReplyNumList(string pids)
+        {
+            string sql = $@"select ParentId,count(0) as ReplyNum from RB_Miai_ActivityDiscuss where Status =0 and ParentId in({pids}) group by ParentId";
+            return Get<RB_Miai_ActivityDiscuss_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Miai/RB_Miai_ActivityEnrollRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Miai;
+using Mall.Model.Extend.Miai;
+using System.Linq;
+
+namespace Mall.Repository.Miai
+{
+    /// <summary>
+    /// 活动仓储层
+    /// </summary>
+    public class RB_Miai_ActivityEnrollRepository : BaseRepository<RB_Miai_ActivityEnroll>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityEnroll_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Miai_ActivityEnroll_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Miai_ActivityEnroll_Extend.Status)}=0 ";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.ActivityId > 0) {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.ActivityId)} ={dmodel.ActivityId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.UserId)} ={dmodel.UserId}";
+            }
+            string sql = $@"select * from RB_Miai_ActivityEnroll where {where} order by Id desc";
+            return GetPage<RB_Miai_ActivityEnroll_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityEnroll_Extend> GetList(RB_Miai_ActivityEnroll_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Miai_ActivityEnroll_Extend.Status)}=0 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.ActivityId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.ActivityId)} ={dmodel.ActivityId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.UserId)} ={dmodel.UserId}";
+            }
+            string sql = $@"select * from RB_Miai_ActivityEnroll where {where} order by Id desc";
+            return Get<RB_Miai_ActivityEnroll_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取活动报名人数
+        /// </summary>
+        /// <param name="activityId"></param>
+        /// <returns></returns>
+        public int GetActivityEnrollNum(int activityId)
+        {
+            string sql = $@" select count(0) from RB_Miai_ActivityEnroll where Status =0 and ActivityId ={activityId}";
+            var obj = ExecuteScalar(sql);
+            return obj == null ? 0 : Convert.ToInt32(obj);
+        }
+    }
+}

Mall.Repository/Miai/RB_Miai_ActivityRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Miai;
+using Mall.Model.Extend.Miai;
+using System.Linq;
+
+namespace Mall.Repository.Miai
+{
+    /// <summary>
+    /// 活动仓储层
+    /// </summary>
+    public class RB_Miai_ActivityRepository : BaseRepository<RB_Miai_Activity>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miai_Activity_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Miai_Activity_Extend dmodel)
+        {
+            string where = $" 1=1 and a.{nameof(RB_Miai_Activity_Extend.Status)}=0 ";
+            if (dmodel.TenantId > 0) {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.ActivityTitle)) {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.ActivityTitle)} like '%{dmodel.ActivityTitle}%'";
+            }
+            if (dmodel.ForumId > 0) {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.ForumId)} ={dmodel.ForumId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.UserId)} ={dmodel.UserId}";
+            }
+            string sql = $@"select a.*,u.Name as UserName,u.Photo from RB_Miai_Activity a
+left join rb_member_user u on a.UserId =u.Id
+where {where} order by a.Id desc";
+            return GetPage<RB_Miai_Activity_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_Activity_Extend> GetList(RB_Miai_Activity_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Miai_Activity_Extend.Status)}=0 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_Activity_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_Activity_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.ActivityTitle))
+            {
+                where += $@" and {nameof(RB_Miai_Activity_Extend.ActivityTitle)} like '%{dmodel.ActivityTitle}%'";
+            }
+            if (dmodel.ForumId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_Activity_Extend.ForumId)} ={dmodel.ForumId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and {nameof(RB_Miai_Activity_Extend.UserId)} ={dmodel.UserId}";
+            }
+            string sql = $@"select * from RB_Miai_Activity where {where} order by Id desc";
+            return Get<RB_Miai_Activity_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Miai/RB_Member_GradeRepository.cs → Mall.Repository/Miai/RB_Miai_ForumRepository.cs

@@ -65,7 +65,7 @@ namespace Mall.Repository.Miai
             {
                 where += $@" and {nameof(RB_Miai_Forum_Extend.IsShow)} ={dmodel.IsShow}";
             }
-            string sql = $@"select * from RB_Miai_Forum where {where} order by Id desc";
+            string sql = $@"select * from RB_Miai_Forum where {where} order by Sort asc,Id desc";
             return Get<RB_Miai_Forum_Extend>(sql).ToList();
         }
     }

Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs

@@ -28,11 +28,11 @@ namespace Mall.Repository.TradePavilion
             DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT * 
-FROM RB_Commerce_Activity
+SELECT A.*,IFNULL(B.TypeName,'') AS ActivityTypeName
+FROM rb_commerce_activity AS A LEFT JOIN rb_commerce_activitytype AS B ON A.ActivityType=B.Id
 WHERE 1=1
 ");
-            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Activity_Extend.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.Status), (int)DateStateEnum.Normal);
             if (query == null)
             {
                 return new List<RB_Commerce_Activity_Extend>();
@@ -41,15 +41,15 @@ WHERE 1=1
             {
                 if (query.TenantId > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Activity_Extend.TenantId), query.TenantId);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.TenantId), query.TenantId);
                 }
                 if (query.MallBaseId > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Activity_Extend.MallBaseId), query.MallBaseId);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.MallBaseId), query.MallBaseId);
                 }
                 if (!string.IsNullOrEmpty(query.ActivityName))
                 {
-                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Activity_Extend.ActivityName));
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Commerce_Activity_Extend.ActivityName));
                     parameters.Add("Name", "%" + query.ActivityName.Trim() + "%");
                 }
             }

Mall.Repository/TradePavilion/RB_Commerce_ActivityTypeRepository.cs

@@ -55,5 +55,43 @@ WHERE 1=1
             }
             return GetPage<RB_Commerce_ActivityType_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_ActivityType_Extend> GetCommerceActivityTypeListRepository(RB_Commerce_ActivityType_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Commerce_ActivityType
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Commerce_ActivityType_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.TypeName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_ActivityType_Extend.TypeName));
+                    parameters.Add("Name", "%" + query.TypeName.Trim() + "%");
+                }
+            }
+            return Get<RB_Commerce_ActivityType_Extend>(builder.ToString(), parameters).ToList();
+        }
     }
 }

Mall.Repository/TradePavilion/RB_CompanyRepository.cs

@@ -55,5 +55,47 @@ WHERE 1=1
             }
             return GetPage<RB_Company_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 根据查询条件获取公司信息实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Company_Extend GetCompanyRepository(RB_Company_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Company
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new RB_Company_Extend();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Company_Extend.CompanyName));
+                    parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.CreateBy), query.CreateBy);
+                }
+            }
+            return Get<RB_Company_Extend>(builder.ToString(), parameters).FirstOrDefault();
+        }
     }
 }

Mall.Repository/TradePavilion/RB_ContractRepository.cs

@@ -55,5 +55,43 @@ WHERE 1=1
             }
             return GetPage<RB_Contract_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 获取联系列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Contract_Extend> GetContractListRepository(RB_Contract_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Contract
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Contract_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Contract_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Contract_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Contract_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Contract_Extend.Name));
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                }
+            }
+            return Get<RB_Contract_Extend>(builder.ToString(), parameters).ToList();
+        }
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -130,6 +130,14 @@ namespace Mall.WebApi.Controllers
                         data = navData
                     };
                     break;
+                case "nav-page":
+                    var navPageData = subItem.data as navItem;
+                    obj = new
+                    {
+                        id = subItem.Id,
+                        data = navPageData
+                    };
+                    break;
                 //轮播广告插件
                 case "banner":
                     var bannerData = subItem.data as bannerItem;

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -27,6 +27,156 @@ namespace Mall.WebApi.Controllers.MallBase
         private readonly MiaiModule miaiModule = new MiaiModule();
 
         #region 活动版块
+        /// <summary>
+        /// 获取活动版块列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetForumList()
+        {
+            var req = base.RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Miai_Forum_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Forum_Extend>(req.msg.ToString());
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.IsShow = 1;
+            var list = miaiModule.GetForumList(demodel);
+            return ApiResult.Success("", list.Select(x => new
+            {
+                x.Id,
+                x.Name,
+                x.Icon,
+                x.Sort,
+                x.IsShow,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            }));
+        }
+
+        /// <summary>
+        /// 获取活动分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityPageList(){
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString());
+            if (demodel.ForumId <= 0) {
+                return ApiResult.ParamIsNull("请传递版块id");
+            }
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            var list = miaiModule.GetActivityPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.ActivityTitle,
+                x.UserId,
+                x.UserName,
+                x.Photo,
+                x.Content,
+                x.ImageList,
+                x.ReplyNum,
+                Deadline = x.Deadline.ToString("yyyy-MM-dd"),
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取活动信息（包含报名人数）
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityInfo(){
+            var userInfo = AppletUserInfo;
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int ActivityId = parms.GetInt("ActivityId", 0);
+            if (ActivityId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+
+            var obj = miaiModule.GetActivityInfo(ActivityId, userInfo);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 获取活动评论分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityDiscussPageList()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());
+            if (demodel.ActivityId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递活动id");
+            }
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            var list = miaiModule.GetActivityDiscussPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.UserId,
+                x.UserName,
+                x.Photo,
+                x.Content,
+                ReplyList = x.ReplyList.Select(z=>new {
+                    z.Id,
+                    z.UserId,
+                    z.UserName,
+                    z.Photo,
+                    z.Content,
+                    z.ReplyUserId,
+                    z.ReplyUserName,
+                    CreateDate = z.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+                }),
+                x.ReplyNum,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取活动回复分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityReplyPageList(){
+
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());
+            if (demodel.ParentId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递上级id");
+            }
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            var list = miaiModule.GetActivityReplyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.UserId,
+                x.UserName,
+                x.Photo,
+                x.Content,
+                x.ReplyUserId,
+                x.ReplyUserName,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
 
         #endregion
 

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -41,9 +41,71 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.MallBaseId = req.MallBaseId;
             var list = miaiModule.GetForumPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
-            pagelist.pageData = list;
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.Name,
+                x.Icon,
+                x.Sort,
+                x.IsShow,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
             return ApiResult.Success("", pagelist);
         }
+
+        /// <summary>
+        /// 设置版块
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetForumInfo() {
+            var req = base.RequestParm;
+            RB_Miai_Forum_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Forum_Extend>(req.msg.ToString());
+            if (string.IsNullOrEmpty(demodel.Name))
+            {
+                return ApiResult.ParamIsNull("请输入版块名称");
+            }
+            if (string.IsNullOrEmpty(demodel.Icon)) {
+                return ApiResult.ParamIsNull("请选择版块图标");
+            }
+
+            demodel.TenantId = Convert.ToInt32(req.uid);
+            demodel.MallBaseId = req.MallBaseId;
+            demodel.IsShow = demodel.IsShow == 0 ? 1 : demodel.IsShow;
+            demodel.Status = 0;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag = miaiModule.SetForumInfo(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 设置版块状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetForumState() {
+            var req = base.RequestParm;
+            var parms = JObject.Parse(req.msg.ToString());
+            int ForumId = parms.GetInt("ForumId", 0);
+            int Type = parms.GetInt("Type", 1);// 类型  1显示/不显示   2删除
+
+            bool flag = miaiModule.SetForumState(ForumId, Type);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
         #endregion
 
        

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Mall.Common.API;
+using Mall.Common.Plugin;
+using Mall.Model.Extend.TradePavilion;
+using Mall.Module.TradePavilion;
+using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
+
+namespace Mall.WebApi.Controllers.TradePavilion
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class AppletTradeController : BaseController
+    {
+        /// <summary>
+        /// 联系人处理类对象
+        /// </summary>
+        private readonly ContractModule module = new ContractModule();
+
+        /// <summary>
+        /// 投资采购处理类对象
+        /// </summary>
+        private readonly InvestmentProcurementModule procurementModule = new InvestmentProcurementModule();
+
+        /// <summary>
+        /// 公司信息处理类对象
+        /// </summary>
+        private readonly CompanyModule companyModule = new CompanyModule();
+
+
+        /// <summary>
+        /// 商会活动处理类对象
+        /// </summary>
+        private readonly CommerceActivityModule activityModule = new CommerceActivityModule();
+
+        /// <summary>
+        /// 商会活动报名处理类对象
+        /// </summary>
+        private readonly CommerceConsultModule consultModule = new CommerceConsultModule();
+
+        /// <summary>
+        /// 新增修改公司信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetCompany()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var extModel = new RB_Company_Extend()
+            {
+                CompanyId = parms.GetInt("CompanyId"),
+                CompanyName = parms.GetStringValue("CompanyName"),
+                CompanyEnName = parms.GetStringValue("CompanyEnName"),
+                Principal = parms.GetStringValue("Principal"),
+                Mobile = parms.GetStringValue("Mobile"),
+                EMail = parms.GetStringValue("EMail"),
+                LegalPerson = parms.GetStringValue("LegalPerson"),
+                WechatNo = parms.GetStringValue("WechatNo"),
+                CompanyIntro = parms.GetStringValue("CompanyIntro"),
+                DomainUrl = parms.GetStringValue("DomainUrl"),
+                FoundingTime = parms.GetDateTime("FoundingTime"),
+                EmployeeNum = parms.GetInt("EmployeeNum"),
+                AnnualSales = parms.GetDecimal("AnnualSales"),
+                AnnualImport = parms.GetDecimal("AnnualImport"),
+                Address = parms.GetStringValue("Address"),
+                EnAddress = parms.GetStringValue("EnAddress"),
+                Industry = parms.GetStringValue("Industry"),
+                ExportCountry = parms.GetStringValue("ExportCountry"),
+                ImportCountry = parms.GetStringValue("ImportCountry"),
+                ImportCategory = parms.GetStringValue("ImportCategory"),
+                OtherInfo = parms.GetStringValue("OtherInfo"),
+            };
+            var userInfo = AppletUserInfo;
+            extModel.Status = Common.Enum.DateStateEnum.Normal;
+            extModel.MallBaseId = userInfo.MallBaseId;
+            extModel.TenantId = userInfo.TenantId;
+            Int32.TryParse(userInfo.UserId.ToString(), out int Uid);
+            extModel.CreateBy = Uid;
+            extModel.CreateDate = DateTime.Now;
+            extModel.UpdateBy = Uid;
+            extModel.UpdateDate = DateTime.Now;
+            var flag = companyModule.SetCompanyModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取当前用户的公司信息实体
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetUserCompany()
+        {
+            var userInfo = AppletUserInfo;
+            var model = companyModule.GetCompanyByUserIdModule(userInfo.UserId);
+            return ApiResult.Success(data: model);
+        }
+    }
+}

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -6,6 +6,7 @@ using Mall.Common.Plugin;
 using Mall.Model.Extend.TradePavilion;
 using Mall.Module.TradePavilion;
 using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -51,6 +52,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取联系人分页列表
         /// </summary>
         /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetContractPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -77,6 +81,33 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
+        /// <summary>
+        /// 获取联系人列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetContractList()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Contract_Extend()
+            {
+                Name = parms.GetStringValue("Name")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = module.GetContractListModule(query);
+            if (list != null && list.Count > 0)
+            {
+                foreach (var item in list)
+                {
+                    if (item.CreateBy > 0)
+                    {
+                        item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.Account ?? "";
+                    }
+                }
+            }
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 新增修改联系人
         /// </summary>
@@ -100,6 +131,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             Int32.TryParse(RequestParm.uid, out int Uid);
             extModel.CreateBy = Uid;
             extModel.CreateDate = DateTime.Now;
+            extModel.UpdateBy = Uid;
+            extModel.UpdateDate = DateTime.Now;
             var flag = module.SetContractModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
@@ -108,6 +141,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取角色实体
         /// </summary>
         /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetContract()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -249,48 +285,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
-        /// <summary>
-        /// 新增修改公司信息
-        /// </summary>
-        /// <returns></returns>
-        public ApiResult SetCompany()
-        {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var extModel = new RB_Company_Extend()
-            {
-                CompanyId = parms.GetInt("CompanyId"),
-                CompanyName = parms.GetStringValue("CompanyName"),
-                CompanyEnName = parms.GetStringValue("CompanyEnName"),
-                Principal = parms.GetStringValue("Principal"),
-                Mobile = parms.GetStringValue("Mobile"),
-                EMail = parms.GetStringValue("EMail"),
-                LegalPerson = parms.GetStringValue("LegalPerson"),
-                WechatNo = parms.GetStringValue("WechatNo"),
-                CompanyIntro = parms.GetStringValue("CompanyIntro"),
-                DomainUrl = parms.GetStringValue("DomainUrl"),
-                FoundingTime = parms.GetDateTime("FoundingTime"),
-                EmployeeNum = parms.GetInt("EmployeeNum"),
-                AnnualSales = parms.GetDecimal("AnnualSales"),
-                AnnualImport = parms.GetDecimal("AnnualImport"),
-                Address = parms.GetStringValue("Address"),
-                EnAddress = parms.GetStringValue("EnAddress"),
-                Industry = parms.GetStringValue("Industry"),
-                ExportCountry = parms.GetStringValue("ExportCountry"),
-                ImportCountry = parms.GetStringValue("ImportCountry"),
-                ImportCategory = parms.GetStringValue("ImportCategory"),
-                OtherInfo = parms.GetStringValue("OtherInfo"),
-            };
-            extModel.Status = Common.Enum.DateStateEnum.Normal;
-            extModel.MallBaseId = RequestParm.MallBaseId;
-            extModel.TenantId = RequestParm.TenantId;
-            Int32.TryParse(RequestParm.uid, out int Uid);
-            extModel.CreateBy = Uid;
-            extModel.CreateDate = DateTime.Now;
-            extModel.UpdateBy = Uid;
-            extModel.UpdateDate = DateTime.Now;
-            var flag = companyModule.SetCompanyModule(extModel);
-            return flag ? ApiResult.Success() : ApiResult.Failed();
-        }
 
         /// <summary>
         /// 获取公司信息详情
@@ -422,6 +416,24 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceActivityTypeList()
+        {
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_ActivityType_Extend()
+            {
+                TypeName = jObj.GetStringValue("TypeName")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = activityModule.GetCommerceActivityTypeListModule(query);
+            
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 新增修改商会活动类型
         /// </summary>
@@ -432,7 +444,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var extModel = new RB_Commerce_ActivityType_Extend()
             {
                 Id = jObj.GetInt("Id"),
-                TypeName = jObj.GetStringValue("TypeName")
+                TypeName = jObj.GetStringValue("TypeName"),
+                CoverImage=jObj.GetStringValue("CoverImage")
             };
             extModel.Status = Common.Enum.DateStateEnum.Normal;
             extModel.MallBaseId = RequestParm.MallBaseId;