解决冲突

Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs

@@ -31,5 +31,50 @@ namespace Mall.Model.Extend.TradePavilion
         /// 商会活动详情列表
         /// </summary>
         public List<RB_Commerce_Details_Extend> CommerceDetailsList { get; set; }
+
+        /// <summary>
+        /// 活动状态
+        /// </summary>
+        public int ActivityStatus
+        {
+            get
+            {
+                int status = 0;//未开始
+                DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now));
+                if (currentDay >= this.StartTime && currentDay <= this.EndTime)
+                {
+                    status = 1;//进行中
+                }
+                else if (currentDay > this.EndTime)
+                {
+                    status = 2;//已结束
+                }
+                return status;
+            }
+        }
+
+        /// <summary>
+        /// 活动状态字符串
+        /// </summary>
+        public string ActivityStatusStr
+        {
+            get
+            {
+                string str = "未开始";
+                switch (this.ActivityStatus)
+                {
+                    case 0:
+                        str = "未开始";
+                        break;
+                    case 1:
+                        str = "进行中";
+                        break;
+                    case 2:
+                        str = "已结束";
+                        break;
+                }
+                return str;
+            }
+        }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Commerce_News_Extend.cs

@@ -10,5 +10,9 @@ namespace Mall.Model.Extend.TradePavilion
     /// </summary>
     public class RB_Commerce_News_Extend : RB_Commerce_News
     {
+        /// <summary>
+        /// 发布时间
+        /// </summary>
+        public string PublishTimeStr { get { return Common.ConvertHelper.FormatTime(this.PublishTime); } }
     }
 }

Mall.Module.Miai/MiaiModule.cs

@@ -174,6 +174,7 @@ namespace Mall.Module.Miai
             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());
+            var umodel = CacheManager.User.UserReidsCache.GetAppletUserLoginInfo(model.UserId);
             return new
             {
                 model.Id,
@@ -181,6 +182,8 @@ namespace Mall.Module.Miai
                 model.Content,
                 ImageList = !string.IsNullOrEmpty(model.Images) ? JsonConvert.DeserializeObject<List<string>>(model.Images) : new List<string>() { },
                 model.UserId,
+                UserName = umodel.Name,
+                umodel.Photo,
                 Deadline = model.Deadline.ToString("yyyy-MM-dd"),
                 CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 PeopleNum,
@@ -189,6 +192,36 @@ namespace Mall.Module.Miai
             };
         }
 
+        /// <summary>
+        /// 后台获取活动信息
+        /// </summary>
+        /// <param name="activityId"></param>
+        /// <returns></returns>
+        public object GetActivityInfo_V2(int activityId)
+        {
+            var model = miai_ActivityRepository.GetEntity(activityId);
+            if (model == null) { return ""; }
+            //获取活动报名人数
+            int PeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId);
+            //查询活动回复数量
+            var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(activityId.ToString());
+            var umodel = CacheManager.User.UserReidsCache.GetAppletUserLoginInfo(model.UserId);
+            return new
+            {
+                model.Id,
+                model.ActivityTitle,
+                model.Content,
+                ImageList = !string.IsNullOrEmpty(model.Images) ? JsonConvert.DeserializeObject<List<string>>(model.Images) : new List<string>() { },
+                model.UserId,
+                UserName = umodel.Name,
+                umodel.Photo,
+                Deadline = model.Deadline.ToString("yyyy-MM-dd"),
+                CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                PeopleNum,
+                ReplyNum = rlist.FirstOrDefault()?.ReplyNum ?? 0
+            };
+        }
+
         /// <summary>
         /// 发帖招募
         /// </summary>
@@ -248,6 +281,29 @@ namespace Mall.Module.Miai
             return flag ? "" : "出错了，请联系管理员";
         }
 
+        /// <summary>
+        /// 后台删除帖子
+        /// </summary>
+        /// <param name="activityId"></param>
+        /// <param name="empId"></param>
+        /// <returns></returns>
+        public string DelActivityInfo_V2(int activityId, int empId)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Miai_Activity_Extend.Status),1},
+                { nameof(RB_Miai_Activity_Extend.UpdateDate),DateTime.Now}
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Miai_Activity_Extend.Id),
+                        FiledValue=activityId,
+                        OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            bool flag = miai_ActivityRepository.Update(keyValues, wheres);
+            return flag ? "" : "出错了，请联系管理员";
+        }
+
         /// <summary>
         /// 获取活动评论分页列表
         /// </summary>
@@ -269,6 +325,17 @@ namespace Mall.Module.Miai
                 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;
+                    item.ImageList = new List<string>();
+                    if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]") {
+                        item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images);
+                    }
+                    foreach (var qitem in item.ReplyList) {
+                        qitem.ImageList = new List<string>();
+                        if (!string.IsNullOrEmpty(qitem.Images) && qitem.Images != "[]")
+                        {
+                            qitem.ImageList = JsonConvert.DeserializeObject<List<string>>(qitem.Images);
+                        }
+                    }
                 }
             }
             return list;
@@ -285,6 +352,14 @@ namespace Mall.Module.Miai
         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);
+            foreach (var qitem in list)
+            {
+                qitem.ImageList = new List<string>();
+                if (!string.IsNullOrEmpty(qitem.Images) && qitem.Images != "[]")
+                {
+                    qitem.ImageList = JsonConvert.DeserializeObject<List<string>>(qitem.Images);
+                }
+            }
             return list;
         }
 
@@ -346,6 +421,29 @@ namespace Mall.Module.Miai
             return flag ? "" : "出错了，请联系管理员";
         }
 
+        /// <summary>
+        /// 后台删除回复
+        /// </summary>
+        /// <param name="discussId"></param>
+        /// <param name="empId"></param>
+        /// <returns></returns>
+        public string DelActivityDiscussInfo_V2(int discussId, int empId)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Miai_ActivityDiscuss_Extend.Status),1},
+                { nameof(RB_Miai_ActivityDiscuss_Extend.UpdateDate),DateTime.Now}
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Miai_ActivityDiscuss_Extend.Id),
+                        FiledValue=discussId,
+                        OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            bool flag = miai_ActivityDiscussRepository.Update(keyValues, wheres);
+            return flag ? "" : "出错了，请联系管理员";
+        }
+
         /// <summary>
         /// 获取报名分页列表
         /// </summary>
@@ -373,7 +471,8 @@ namespace Mall.Module.Miai
             if (model.Deadline <= DateTime.Now) {
                 return "已过了报名时间，无法报名";
             }
-            return miai_ActivityEnrollRepository.Insert(demodel) > 0;
+            bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0;
+            return flag ? "" : "出错了，请联系管理员";
         }
 
         /// <summary>

Mall.Module.Product/ProductModule.cs

@@ -5383,6 +5383,37 @@ namespace Mall.Module.Product
             return treeList;
         }
 
+        /// <summary>
+        /// 获取树形结构列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Product_Category_Extend> GetProductCategoryAllList(RB_Product_Category_Extend demodel)
+        {
+            var list = product_CategoryRepository.GetList(demodel);
+            if (list.Any())
+            {
+                List<int> ImgIds = new List<int>();
+                ImgIds.AddRange(list.Select(x => x.Icon ?? 0).Distinct());
+                ImgIds.AddRange(list.Select(x => x.BigIcon ?? 0).Distinct());
+                ImgIds.AddRange(list.Select(x => x.AdvertisingImage ?? 0).Distinct());
+                List<RB_Material_Info_Extend> mlist = new List<RB_Material_Info_Extend>();
+                if (ImgIds.Any())
+                {
+                    mlist = material_InfoRepository.GetList(new RB_Material_Info_Extend() { MaterialIds = string.Join(",", ImgIds), TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+                }
+                foreach (var item in list)
+                {
+                    item.IconPath = mlist.Where(x => x.Id == item.Icon).FirstOrDefault()?.Path ?? "";
+                    item.BigIconPath = mlist.Where(x => x.Id == item.BigIcon).FirstOrDefault()?.Path ?? "";
+                    item.AdvertisingImagePath = mlist.Where(x => x.Id == item.AdvertisingImage).FirstOrDefault()?.Path ?? "";
+                    item.CategoryPageTypeStr = item.CategoryPageType.GetEnumName();
+                }
+                list = list.OrderBy(x => x.Sort).ThenBy(x => x.Id).ToList();
+            }
+            return list;
+        }
+
         /// <summary>
         /// 获取子集列表
         /// </summary>

Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs

@@ -52,6 +52,10 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Commerce_Activity_Extend.ActivityName));
                     parameters.Add("Name", "%" + query.ActivityName.Trim() + "%");
                 }
+                if (query.ActivityType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.ActivityType), query.ActivityType);
+                }
             }
             return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Mall.Repository/TradePavilion/RB_InvestmentProcurementRepository.cs

@@ -48,6 +48,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_InvestmentProcurement_Extend.MallBaseId), query.MallBaseId);
                 }
+                if (query.Type > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_InvestmentProcurement_Extend.Type), query.Type);
+                }
                 if (!string.IsNullOrEmpty(query.CompanyName))
                 {
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Company_Extend.CompanyName));

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -128,6 +128,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             demodel.ImageList ??= new List<string>();
             demodel.Images = JsonConvert.SerializeObject(demodel.ImageList);
+            demodel.Deadline = Convert.ToDateTime(demodel.Deadline.ToString("yyyy-MM-dd") + " 23:59:59");
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
             demodel.Status = 0;
@@ -193,12 +194,14 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.UserName,
                 x.Photo,
                 x.Content,
+                x.ImageList,
                 ReplyList = x.ReplyList.Select(z=>new {
                     z.Id,
                     z.UserId,
                     z.UserName,
                     z.Photo,
                     z.Content,
+                    z.ImageList,
                     z.ReplyUserId,
                     z.ReplyUserName,
                     CreateDate = z.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
@@ -235,6 +238,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.UserName,
                 x.Photo,
                 x.Content,
+                x.ImageList,
                 x.ReplyUserId,
                 x.ReplyUserName,
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
@@ -247,7 +251,7 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetActivityDiscussInfo() {
+        public ApiResult SgetActivityDiscussInfo() {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
             RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -108,6 +108,216 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
         #endregion
+        #region 招募贴
+
+        /// <summary>
+        /// 获取活动分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityPageList()
+        {
+            var parms = RequestParm;
+            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 = parms.TenantId;
+            demodel.MallBaseId = parms.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 parms = JObject.Parse(RequestParm.msg.ToString());
+            int ActivityId = parms.GetInt("ActivityId", 0);
+            if (ActivityId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            var obj = miaiModule.GetActivityInfo_V2(ActivityId);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 删除招募贴
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelActivityInfo()
+        {
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int ActivityId = parms.GetInt("ActivityId", 0);
+            if (ActivityId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            string msg = miaiModule.DelActivityInfo_V2(ActivityId, RequestParm.EmpId);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed(msg);
+            }
+        }
+
+        /// <summary>
+        /// 获取活动评论分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityDiscussPageList()
+        {
+            var parms = RequestParm;
+            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 = parms.TenantId;
+            demodel.MallBaseId = parms.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,
+                x.ImageList,
+                ReplyList = x.ReplyList.Select(z => new {
+                    z.Id,
+                    z.UserId,
+                    z.UserName,
+                    z.Photo,
+                    z.Content,
+                    z.ImageList,
+                    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;
+            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 = parms.TenantId;
+            demodel.MallBaseId = parms.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.ImageList,
+                x.ReplyUserId,
+                x.ReplyUserName,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 删除评论
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelActivityDiscussInfo()
+        {
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int DiscussId = parms.GetInt("DiscussId", 0);
+            if (DiscussId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            string msg = miaiModule.DelActivityDiscussInfo_V2(DiscussId, RequestParm.EmpId);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed(msg);
+            }
+        }
+
+        /// <summary>
+        /// 获取活动报名分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityEnrollPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Miai_ActivityEnroll_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityEnroll_Extend>(parms.msg.ToString());
+            if (demodel.ActivityId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递活动id");
+            }
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = miaiModule.GetActivityEnrollPageList(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,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        #endregion
 
 
         #region 星星商品

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -94,6 +94,28 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", list);
         }
 
+        /// <summary>
+        /// 获取分类树形结构
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetProductCategoryAllList(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (parms.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            RB_Product_Category_Extend demodel = JsonConvert.DeserializeObject<RB_Product_Category_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.Enabled = 1;
+            demodel.IsShow = 1;
+            var list = productModule.GetProductCategoryAllList(demodel);
+            return ApiResult.Success("", list);
+        }
+
         /// <summary>
         /// 获取分类样式
         /// </summary>

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Mall.WebApi.Controllers.TradePavilion
@@ -101,5 +102,55 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var model = companyModule.GetCompanyByUserIdModule(userInfo.UserId);
             return ApiResult.Success(data: model);
         }
+
+        /// <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.Select(qitem=>new { qitem.Id,qitem.CoverImage,qitem.TypeName}));
+        }
+
+        /// <summary>
+        /// 获取商会活动分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceActivityPage()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_Activity_Extend()
+            {
+                 ActivityType= jObj.GetInt("ActivityType")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = activityModule.GetCommerceActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+        /// <summary>
+        /// 获取商会活动详情
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceActivity()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var extModel = activityModule.GetCommerceActivityModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
     }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -184,7 +184,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_InvestmentProcurement_Extend()
             {
-                CompanyName = parms.GetStringValue("CompanyName")
+                CompanyName = parms.GetStringValue("CompanyName"),
+                Type=parms.GetInt("Type"),
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;