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

Mall.Model/Entity/BaseSetUp/RB_MallBase.cs

@@ -359,5 +359,10 @@ namespace Mall.Model.Entity.BaseSetUp
         /// 是否开启全局分类包邮规则
         /// </summary>
         public int IsFreeShipping { get; set; }
+
+        /// <summary>
+        /// 是否显示价格(0-不显示，1-显示)
+        /// </summary>
+        public int IsShowPrice { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_Commerce_News.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 韩国馆新闻实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Commerce_News
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 封面图
+        /// </summary>
+        public string CoverImg { get; set; }
+
+        /// <summary>
+        /// 新闻标题
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 行业
+        /// </summary>
+        public string Industry { get; set; }
+
+        /// <summary>
+        /// 发布时间
+        /// </summary>
+        public DateTime PublishTime { get; set; }
+
+        /// <summary>
+        /// 新闻详情
+        /// </summary>
+        public string NewsInfo { 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; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+    }
+}

Mall.Model/Extend/Miai/RB_Miai_ActivityDiscuss_Extend.cs

@@ -42,5 +42,10 @@ namespace Mall.Model.Extend.Miai
         /// 回复数量
         /// </summary>
         public int ReplyNum { get; set; }
+
+        /// <summary>
+        /// 图片列表
+        /// </summary>
+        public List<string> ImageList { get; set; }
     }
 }

Mall.Model/Extend/Miai/RB_Miai_ActivityEnroll_Extend.cs

@@ -13,7 +13,14 @@ namespace Mall.Model.Extend.Miai
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Miai_ActivityEnroll_Extend : RB_Miai_ActivityEnroll
     {
-        
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
 
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Commerce_News_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 韩国馆新闻扩展实体类
+    /// </summary>
+    public class RB_Commerce_News_Extend : RB_Commerce_News
+    {
+    }
+}

Mall.Module.Miai/MiaiModule.cs

@@ -189,6 +189,65 @@ namespace Mall.Module.Miai
             };
         }
 
+        /// <summary>
+        /// 发帖招募
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool SetActivityInfo(RB_Miai_Activity_Extend demodel)
+        {
+            if (demodel.Id > 0)
+            {
+                var model = miai_ActivityRepository.GetEntity(demodel.Id);
+                if (model == null || model.Status == 1) { return false; }
+                if (model.UserId != demodel.UserId) { return false; }
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Miai_Activity_Extend.ActivityTitle),demodel.ActivityTitle},
+                    { nameof(RB_Miai_Activity_Extend.Content),demodel.Content},
+                    { nameof(RB_Miai_Activity_Extend.Images),demodel.Images},
+                    { nameof(RB_Miai_Activity_Extend.Deadline),demodel.Deadline},
+                    { nameof(RB_Miai_Activity_Extend.UpdateDate),demodel.UpdateDate}
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Miai_Activity_Extend.Id),
+                          FiledValue=demodel.Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                return miai_ActivityRepository.Update(keyValues, wheres);
+            }
+            else {
+                return miai_ActivityRepository.Insert(demodel) > 0;
+            }
+        }
+
+        /// <summary>
+        /// 删除招募贴
+        /// </summary>
+        /// <param name="activityId"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public string DelActivityInfo(int activityId, AppletUserInfo userInfo)
+        {
+            var model = miai_ActivityRepository.GetEntity(activityId);
+            if (model == null || model.Status == 1) { return "帖子不存在或已被删除"; }
+            if (model.UserId != userInfo.UserId) { return "没有权限删除"; }
+            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>
@@ -213,7 +272,7 @@ namespace Mall.Module.Miai
                 }
             }
             return list;
-        }
+        }        
 
         /// <summary>
         /// 获取评论回复分页列表
@@ -228,6 +287,121 @@ namespace Mall.Module.Miai
             var list = miai_ActivityDiscussRepository.GetPageList(pageIndex, pageSize, out count, demodel);
             return list;
         }
+
+        /// <summary>
+        /// 设置评论
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool SetActivityDiscussInfo(RB_Miai_ActivityDiscuss_Extend demodel)
+        {
+            if (demodel.Id > 0)
+            {
+                var model = miai_ActivityDiscussRepository.GetEntity(demodel.Id);
+                if (model == null || model.Status == 1) { return false; }
+                if (model.UserId != demodel.UserId) { return false; }
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Miai_ActivityDiscuss_Extend.Content),demodel.Content},
+                    { nameof(RB_Miai_ActivityDiscuss_Extend.Images),demodel.Images},
+                    { nameof(RB_Miai_ActivityDiscuss_Extend.UpdateDate),demodel.UpdateDate}
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Miai_ActivityDiscuss_Extend.Id),
+                          FiledValue=demodel.Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                return miai_ActivityDiscussRepository.Update(keyValues, wheres);
+            }
+            else
+            {
+                return miai_ActivityDiscussRepository.Insert(demodel) > 0;
+            }
+        }
+
+        /// <summary>
+        /// 删除回复
+        /// </summary>
+        /// <param name="discussId"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public string DelActivityDiscussInfo(int discussId, AppletUserInfo userInfo)
+        {
+            var model = miai_ActivityDiscussRepository.GetEntity(discussId);
+            if (model == null || model.Status == 1) { return "回复不存在或已被删除"; }
+            if (model.UserId != userInfo.UserId) { return "没有权限删除"; }
+            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>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_ActivityEnroll_Extend> GetActivityEnrollPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityEnroll_Extend demodel)
+        {
+            return miai_ActivityEnrollRepository.GetPageList(pageIndex, pageSize, out count, demodel);
+        }
+
+        /// <summary>
+        /// 活动报名
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public string SetActivityEnrollInfo(RB_Miai_ActivityEnroll_Extend demodel)
+        {
+            var list = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = demodel.TenantId, ActivityId = demodel.ActivityId, UserId = demodel.UserId });
+            if (list.Any()) { return "已存在报名信息"; }
+            var model = miai_ActivityRepository.GetEntity(demodel.ActivityId);
+            if (model == null || model.Status == 1) { return "活动不存在"; }
+            if (model.Deadline <= DateTime.Now) {
+                return "已过了报名时间，无法报名";
+            }
+            return miai_ActivityEnrollRepository.Insert(demodel) > 0;
+        }
+
+        /// <summary>
+        /// 取消报名
+        /// </summary>
+        /// <param name="enrollId"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public string CancelActivityEnrollInfo(int enrollId, AppletUserInfo userInfo)
+        {
+            var model = miai_ActivityEnrollRepository.GetEntity(enrollId);
+            if (model == null || model.Status == 1) { return "已取消报名"; }
+            if (model.UserId != userInfo.UserId) { return "没有取消权限"; }
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Miai_ActivityEnroll_Extend.Status),1 },
+                { nameof(RB_Miai_ActivityEnroll_Extend.UpdateDate),DateTime.Now },
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                     FiledName=nameof(RB_Miai_ActivityEnroll_Extend.Id),
+                      FiledValue=enrollId,
+                       OperatorEnum=OperatorEnum.Equal
+                }
+            };
+
+            bool flag = miai_ActivityEnrollRepository.Update(keyValues, wheres);
+            return flag ? "" : "出错了，请联系管理员";
+        }
         #endregion
 
         #region 会员基础信息

Mall.Module.TradePavilion/CommerceNewsModule.cs

+using Mall.Model.Extend.TradePavilion;
+using Mall.Repository.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Module.TradePavilion
+{
+    /// <summary>
+    /// 韩国馆新闻处理类
+    /// </summary>
+    public class CommerceNewsModule
+    {
+        /// <summary>
+        /// 韩国馆新闻仓储层对象
+        /// </summary>
+        private readonly RB_Commerce_NewsRepository commerce_NewsRepository = new RB_Commerce_NewsRepository();
+
+        /// <summary>
+        /// 获取新闻分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_News_Extend> GetCommerceNewsPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_News_Extend query)
+        {
+            return commerce_NewsRepository.GetCommerceNewsPageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 新增修改新闻
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetCommerceNewsModule(RB_Commerce_News_Extend model)
+        {
+            bool flag;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_Commerce_News_Extend.CoverImg),model.CoverImg},
+                    { nameof(RB_Commerce_News_Extend.Title),model.Title},
+                    { nameof(RB_Commerce_News_Extend.Industry),model.Industry},
+                    { nameof(RB_Commerce_News_Extend.PublishTime),model.PublishTime},
+                    { nameof(RB_Commerce_News_Extend.NewsInfo),model.NewsInfo},
+                    { nameof(RB_Commerce_News_Extend.UpdateBy),model.UpdateBy},
+                    { nameof(RB_Commerce_News_Extend.UpdateDate),model.UpdateDate},
+                };
+                flag = commerce_NewsRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_News_Extend.Id),model.Id));
+            }
+            else
+            {
+                var newId = commerce_NewsRepository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取新闻信息实体
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_Commerce_News_Extend GetCommerceNewsModule(int Id)
+        {
+            return commerce_NewsRepository.GetEntity<RB_Commerce_News_Extend>(Id);
+        }
+
+        /// <summary>
+        /// 更新新闻信息状态
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="Status"></param>
+        /// <returns></returns>
+        public bool RemoveCommerceNewsModule(int Id, int Status)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Commerce_News_Extend.Status),Status },
+            };
+            bool flag = commerce_NewsRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_News_Extend.Id), Id));
+            return flag;
+        }
+    }
+}

Mall.Repository/Miai/RB_Miai_ActivityEnrollRepository.cs

@@ -23,22 +23,24 @@ namespace Mall.Repository.Miai
         /// <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 ";
+            string where = $" 1=1 and e.{nameof(RB_Miai_ActivityEnroll_Extend.Status)}=0 ";
             if (dmodel.TenantId > 0) {
-                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.TenantId)}={dmodel.TenantId}";
+                where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.TenantId)}={dmodel.TenantId}";
             }
             if (dmodel.MallBaseId > 0)
             {
-                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.MallBaseId)}={dmodel.MallBaseId}";
+                where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.MallBaseId)}={dmodel.MallBaseId}";
             }
             if (dmodel.ActivityId > 0) {
-                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.ActivityId)} ={dmodel.ActivityId}";
+                where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.ActivityId)} ={dmodel.ActivityId}";
             }
             if (dmodel.UserId > 0)
             {
-                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.UserId)} ={dmodel.UserId}";
+                where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.UserId)} ={dmodel.UserId}";
             }
-            string sql = $@"select * from RB_Miai_ActivityEnroll where {where} order by Id desc";
+            string sql = $@"select e.*,u.Name as UserName,u.Photo from RB_Miai_ActivityEnroll e
+left join rb_member_user u on e.UserId = u.Id
+where {where} order by e.Id desc";
             return GetPage<RB_Miai_ActivityEnroll_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
 

Mall.Repository/TradePavilion/RB_Commerce_NewsRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 韩国馆新闻仓储层
+    /// </summary>
+    public class RB_Commerce_NewsRepository : BaseRepository<RB_Commerce_News>
+    {
+        /// <summary>
+        /// 获取新闻分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_News_Extend> GetCommerceNewsPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_News_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM rb_commerce_news AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Commerce_News_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.Title))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Commerce_News_Extend.Title));
+                    parameters.Add("Name", "%" + query.Title.Trim() + "%");
+                }
+            }
+            return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -2517,6 +2517,7 @@ namespace Mall.WebApi.Controllers
                 is_show_cart = mallBaseModel?.ListShopCar,
                 is_show_sales_num = mallBaseModel?.ListBuyCount,
                 is_show_goods_name = mallBaseModel?.ListName,
+                is_show_goods_price= mallBaseModel?.IsShowPrice??0,//是否显示商品价格【hk2020-02-21新增】
                 is_underline_price = mallBaseModel?.DetailsLineationPrice,
                 is_express = mallBaseModel?.DeatilsExpress,
                 is_not_share_show = mallBaseModel?.OtherNoShare,

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -103,6 +103,69 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", obj);
         }
 
+        /// <summary>
+        /// 发布招募贴
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetActivityInfo() {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString());
+            if (demodel.ForumId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递版块id");
+            }
+            if (string.IsNullOrEmpty(demodel.ActivityTitle)) {
+                return ApiResult.ParamIsNull("请传递标题名称");
+            }
+            if (string.IsNullOrEmpty(demodel.Content)) {
+                return ApiResult.ParamIsNull("请传递内容");
+            }
+            if (demodel.Deadline < DateTime.Now) {
+                return ApiResult.ParamIsNull("请重新选择报名截止日期");
+            }
+            demodel.ImageList ??= new List<string>();
+            demodel.Images = JsonConvert.SerializeObject(demodel.ImageList);
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.Status = 0;
+            demodel.UserId = userInfo.UserId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag = miaiModule.SetActivityInfo(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 删除招募贴
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelActivityInfo() {
+            var userInfo = AppletUserInfo;
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int ActivityId = parms.GetInt("ActivityId", 0);
+            if (ActivityId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+
+            string msg = miaiModule.DelActivityInfo(ActivityId, userInfo);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed(msg);
+            }
+        }
+
         /// <summary>
         /// 获取活动评论分页列表
         /// </summary>
@@ -178,6 +241,154 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", pagelist);
         }
 
+        /// <summary>
+        /// 设置评论
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetActivityDiscussInfo() {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());
+            if (demodel.ActivityId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递活动id");
+            }
+            if (string.IsNullOrEmpty(demodel.Content))
+            {
+                return ApiResult.ParamIsNull("请传递内容");
+            }
+            
+            demodel.ImageList ??= new List<string>();
+            demodel.Images = JsonConvert.SerializeObject(demodel.ImageList);
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.Status = 0;
+            demodel.UserId = userInfo.UserId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag = miaiModule.SetActivityDiscussInfo(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 删除评论
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelActivityDiscussInfo()
+        {
+            var userInfo = AppletUserInfo;
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int DiscussId = parms.GetInt("DiscussId", 0);
+            if (DiscussId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            string msg = miaiModule.DelActivityDiscussInfo(DiscussId, userInfo);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed(msg);
+            }
+        }
+
+        /// <summary>
+        /// 获取活动报名分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityEnrollPageList() {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            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 = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.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);
+        }
+
+        /// <summary>
+        /// 设置报名
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetActivityEnrollInfo() {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Miai_ActivityEnroll_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityEnroll_Extend>(parms.msg.ToString());
+            if (demodel.ActivityId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递活动id");
+            }
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.Status = 0;
+            demodel.UserId = userInfo.UserId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            string msg = miaiModule.SetActivityEnrollInfo(demodel);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed(msg);
+            }
+        }
+
+        /// <summary>
+        /// 取消报名
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult CancelActivityEnrollInfo() {
+            var userInfo = AppletUserInfo;
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int EnrollId = parms.GetInt("EnrollId", 0);
+            if (EnrollId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            string msg = miaiModule.CancelActivityEnrollInfo(EnrollId, userInfo);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed(msg);
+            }
+        }
+
         #endregion
 
         #region 基础信息

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -46,6 +46,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         private readonly CommerceConsultModule consultModule = new CommerceConsultModule();
 
+        /// <summary>
+        /// 韩国馆新闻处理类
+        /// </summary>
+        private readonly CommerceNewsModule commerceNewsModule = new CommerceNewsModule();
+
         #region 联系人管理
 
         /// <summary>
@@ -557,5 +562,82 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
         #endregion
+
+        #region 新闻信息管理
+
+        /// <summary>
+        /// 获取新闻信息分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceNewsPage()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_News_Extend()
+            {
+                Title = parms.GetStringValue("Title")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = commerceNewsModule.GetCommerceNewsPageListModule(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 GetCommerceNews()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var extModel = commerceNewsModule.GetCommerceNewsModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 删除新闻信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveCommerceNews()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var Status = parms.GetInt("Status", 0);
+            var flag = commerceNewsModule.RemoveCommerceNewsModule(Id, Status);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 新增修改新闻
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetCommerceNews()
+        {
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var extModel = new RB_Commerce_News_Extend()
+            {
+                Id = jObj.GetInt("Id"),
+                CoverImg=jObj.GetStringValue("CoverImg"),
+                Title= jObj.GetStringValue("Title"),
+                Industry = jObj.GetStringValue("Industry"),
+                PublishTime = jObj.GetDateTime("PublishTime"),
+                NewsInfo = jObj.GetStringValue("NewsInfo"),
+            };
+            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 = commerceNewsModule.SetCommerceNewsModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion
     }
 }