解决冲突

Mall.Common/API/UserInfo.cs

@@ -34,6 +34,11 @@ namespace Mall.Common
         /// </summary>
         public int IsOpenSchool { get; set; }
 
+        /// <summary>
+        /// 是否是韩国馆版本(1-是)
+        /// </summary>
+        public int IsKorea { get; set; }
+
         /// <summary>
         /// 账号
         /// </summary>        

Mall.Model/Entity/BaseSetUp/RB_MallBase.cs

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

Mall.Model/Entity/Product/RB_Goods.cs

@@ -584,5 +584,25 @@ namespace Mall.Model.Entity.Product
         /// 最低利润率
         /// </summary>
         public decimal MinProfitRate { get; set; }
+
+        /// <summary>
+        /// 商品所属国家
+        /// </summary>
+        public string GoodsCountry { get; set; }
+
+        /// <summary>
+        /// 商品地址
+        /// </summary>
+        public string FatCode { get; set; }
+
+        /// <summary>
+        /// 商品简介
+        /// </summary>
+        public string GoodsUrl { get; set; }
+
+        /// <summary>
+        /// 商品Logo
+        /// </summary>
+        public string goodsLogo { get; set; }
     }
 }

Mall.Model/Entity/Product/RB_Goods_Leavemessage.cs

+using Mall.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品留言表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Leavemessage
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 商品编号
+		/// </summary>
+		public int GoodsId { get; set; }
+
+		/// <summary>
+		/// 用户编号
+		/// </summary>
+		public int UserId { get; set; }
+
+		/// <summary>
+		/// 用户名称
+		/// </summary>
+		public string UserName { get; set; }
+
+		/// <summary>
+		/// 用户头像
+		/// </summary>
+		public string UserPhoto { get; set; }
+
+		/// <summary>
+		/// 留言内容
+		/// </summary>
+		public string Content { get; set; }
+
+		/// <summary>
+		/// 商户号id
+		/// </summary>
+		public int TenantId { get; set; }
+
+		/// <summary>
+		/// 小程序id
+		/// </summary>
+		public int MallBaseId { get; set; }
+
+		/// <summary>
+		/// 报名时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+	}
+}

Mall.Model/Entity/TradePavilion/RB_Commerce_Activity.cs

@@ -82,5 +82,15 @@ namespace Mall.Model.Entity.TradePavilion
 		/// 删除状态
 		/// </summary>
 		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 报名开始时间
+		/// </summary>
+		public DateTime? SignStartTime { get; set; }
+
+		/// <summary>
+		/// 报名截止时间
+		/// </summary>
+		public DateTime? SignEndTime { get; set; }
 	}
 }

Mall.Model/Entity/TradePavilion/RB_Commerce_Ask.cs

+using Mall.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// FAT咨询实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Commerce_Ask
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 公司名称
+		/// </summary>
+		public string CompanyName { get; set; }
+
+		/// <summary>
+		/// 联系人(责任人)
+		/// </summary>
+		public string Principal { get; set; }
+
+		/// <summary>
+		/// 联系电话
+		/// </summary>
+		public string Mobile { get; set; }
+
+		/// <summary>
+		/// 邮箱
+		/// </summary>
+		public string EMail { get; set; }
+
+		/// <summary>
+		/// Fat海关编码
+		/// </summary>
+		public string FatCode { get; set; }
+
+		/// <summary>
+		/// 咨询标题
+		/// </summary>
+		public string FatTitle { get; set; }
+
+		/// <summary>
+		/// 咨询问题
+		/// </summary>
+		public string FatQuestion { get; set; }
+
+		/// <summary>
+		/// 咨询回复
+		/// </summary>
+		public string FatContent { 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; }
+
+		/// <summary>
+		/// 咨询状态(0-未回复，1-已回复）
+		/// </summary>
+		public int AskStatus { get; set; }
+
+		/// <summary>
+		/// 回复时间
+		/// </summary>
+		public DateTime? ReplyTime { get; set; }
+
+		/// <summary>
+		/// 回复人
+		/// </summary>
+		public int ReplyId { get; set; }
+	}
+}

Mall.Model/Entity/TradePavilion/RB_Commerce_Comment.cs

+using Mall.Common.Enum;
+using Mall.Common.Enum.Goods;
+using Mall.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 商会活动评论表实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Commerce_Comment
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 活动编号
+		/// </summary>
+		public int ActivityId { get; set; }
+
+		/// <summary>
+		/// 用户编号
+		/// </summary>
+		public int UserId { get; set; }
+
+		/// <summary>
+		/// 客人名称
+		/// </summary>
+		public string UserName { get; set; }
+
+		/// <summary>
+		/// 用户头像
+		/// </summary>
+		public string UserPhoto { get; set; }
+
+		/// <summary>
+		/// 评分 1-5分
+		/// </summary>
+		public int CommentScore { get; set; }
+
+		/// <summary>
+		/// 评论类型  1 好评  2中评   3差评
+		/// </summary>
+		public GoodsCommentTypeEnum CommentGrade { get; set; }
+
+		/// <summary>
+		/// 评论内容
+		/// </summary>
+		public string Content { get; set; }
+
+		/// <summary>
+		/// 评论图片
+		/// </summary>
+		public string CommentImage { get; set; }
+
+		/// <summary>
+		/// 回复
+		/// </summary>
+		public string Reply { get; set; }
+
+		/// <summary>
+		/// 来源
+		/// </summary>
+		public UserSourceEnum PlatformSource { get; set; }
+
+		/// <summary>
+		/// 是否置顶  1是  2否
+		/// </summary>
+		public int Is_Top { get; set; }
+
+		/// <summary>
+		/// 是否显示   1是  2否
+		/// </summary>
+		public int Is_Show { get; set; }
+
+		/// <summary>
+		/// 是否匿名  1是  2否
+		/// </summary>
+		public int Is_Anonymity { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 商户号
+		/// </summary>
+		public int TenantId { get; set; }
+
+		/// <summary>
+		/// 小程序id
+		/// </summary>
+		public int MallBaseId { get; set; }
+
+		/// <summary>
+		/// CreateDate
+		/// </summary>
+		public DateTime CreateDate { get; set; }
+
+		/// <summary>
+		/// UpdateDate
+		/// </summary>
+		public DateTime UpdateDate { get; set; }
+	}
+}

Mall.Model/Entity/TradePavilion/RB_Commerce_News.cs

@@ -16,6 +16,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public int Id { get; set; }
 
+        /// <summary>
+        /// 类型(1-新闻，2-服务类型)
+        /// </summary>
+        public int Type { get; set; }
+
         /// <summary>
         /// 封面图
         /// </summary>

Mall.Model/Entity/TradePavilion/RB_InvestmentProcurement.cs

@@ -175,5 +175,25 @@ namespace Mall.Model.Entity.TradePavilion
 		/// 删除状态
 		/// </summary>
 		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 审核状态(0-待审核，1-审核通过,2-拒绝)
+		/// </summary>
+		public int AuditStatus { get; set; }
+
+		/// <summary>
+		/// 审核内容
+		/// </summary>
+		public string AuditContent { get; set; }
+
+		/// <summary>
+		/// 审核时间
+		/// </summary>
+		public DateTime? AuditTime { get; set; }
+
+		/// <summary>
+		/// 审核人
+		/// </summary>
+		public int AuditBy { get; set; }
 	}
 }

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -469,11 +469,14 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public string MemberBuyVipImg { get; set; }
 
-
         /// <summary>
         /// 1-大图，2-小图
         /// </summary>
         public int ActivityStyle { get; set; }
+
+        /// 是否是韩国馆(1-是)
+        /// </summary>
+        public int IsKorea { get; set; }
     }
 
 

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -340,6 +340,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 模板数据
         /// </summary>
         public object TemplateData { get; set; }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        public int isShow { get; set; }
     }
 
 
@@ -418,6 +423,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 背景颜色
         /// </summary>
         public string background { get; set; }
+
+        /// <summary>
+        /// 是否显示导航标题(1-显示，0-不显示)
+        /// </summary>
+        public int isShowTitle { get; set; }
     }
 
     /// <summary>
@@ -439,6 +449,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 打开方式
         /// </summary>
         public string openType { get; set; }
+
+        /// <summary>
+        /// 链接标题
+        /// </summary>
+        public string title { get; set; }
     }
 
     /// <summary>

Mall.Model/Extend/Product/RB_Goods_Leavemessage_Extend.cs

+using Mall.Model.Entity.Product;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品留言表扩展实体
+    /// </summary>
+    public class RB_Goods_Leavemessage_Extend: RB_Goods_Leavemessage
+    {
+          
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs

@@ -58,6 +58,36 @@ namespace Mall.Model.Extend.TradePavilion
             }
         }
 
+        /// <summary>
+        /// 是否可报名
+        /// </summary>
+        public int IsSignUp
+        {
+            get
+            {
+                int isSign = 0;
+                if (this.SignStartTime != null && this.SignEndTime != null)
+                {
+                    DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now));
+                    if (currentDay >= this.SignStartTime && currentDay <= this.SignEndTime)
+                    {
+                        isSign = 1;//可报名
+                    }
+                }
+                return isSign;
+            }
+        }
+
+        /// <summary>
+        /// 报名开始时间
+        /// </summary>
+        public string SignStartTimeStr { get { return  Common.ConvertHelper.FormatTime(this.SignStartTime); } }
+
+        /// <summary>
+        /// 报名截止时间
+        /// </summary>
+        public string SignEndTimeStr { get { return  Common.ConvertHelper.FormatTime(this.SignEndTime); } }
+
         /// <summary>
         /// 活动状态字符串
         /// </summary>
@@ -86,5 +116,15 @@ namespace Mall.Model.Extend.TradePavilion
         /// 报名人数
         /// </summary>
         public int JoinNum { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 是否报名(0-未报名，1-已报名)
+        /// </summary>
+        public int IsJoinActivity { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Commerce_Ask_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// FAT咨询扩展实体类
+    /// </summary>
+    public class RB_Commerce_Ask_Extend : RB_Commerce_Ask
+    {
+        /// <summary>
+        /// 回复时间
+        /// </summary>
+        public string ReplyTimeStr { get { return Common.ConvertHelper.FormatTimeStr(this.ReplyTime); } }
+
+        /// <summary>
+        /// 咨询回复状态字符串
+        /// </summary>
+        public string AskStatusStr
+        {
+            get
+            {
+                string str = "待回复";
+                if (this.AskStatus == 1)
+                {
+                    str = "已回复";
+                }
+                return str;
+            }
+        }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Commerce_Comment_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_Comment_Extend : RB_Commerce_Comment
+    {
+
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Commerce_News_Extend.cs

@@ -13,6 +13,6 @@ namespace Mall.Model.Extend.TradePavilion
         /// <summary>
         /// 发布时间
         /// </summary>
-        public string PublishTimeStr { get { return Common.ConvertHelper.FormatTime(this.PublishTime); } }
+        public string PublishTimeStr { get { return Common.ConvertHelper.FormatDate(this.PublishTime); } }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Procurement_Extend.cs

@@ -7,6 +7,29 @@ namespace Mall.Model.Extend.TradePavilion
     /// </summary>
     public class RB_InvestmentProcurement_Extend : RB_InvestmentProcurement
     {
+        /// <summary>
+        /// 审核状态字符串
+        /// </summary>
+        public string AuditStatusStr
+        {
+            get
+            {
+                string str = "待审核";
+                if (this.AuditStatus == 1)
+                {
+                    str = "审核通过";
+                }
+                if (this.AuditStatus == 2)
+                {
+                    str = "拒绝";
+                }
+                return str;
+            }
+        }
 
+        /// <summary>
+        /// 成立时间
+        /// </summary>
+        public string FoundingTimeStr { get { return Common.ConvertHelper.FormatDate(this.FoundingTime); } }
     }
 }

Mall.Module.Product/GoodsLeavemessageModule.cs

+using Mall.Common.Enum;
+using Mall.Model.Extend.Product;
+using Mall.Repository.Product;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Module.Product
+{
+   /// <summary>
+   /// 商品留言处理类
+   /// </summary>
+   public  class GoodsLeavemessageModule
+    {
+        /// <summary>
+        /// 商品留言仓储层对象
+        /// </summary>
+        private readonly RB_Goods_LeavemessageRepository goods_LeavemessageRepository = new RB_Goods_LeavemessageRepository();
+
+        /// <summary>
+        /// 获取商品留言分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Goods_Leavemessage_Extend> GetGoodsLeavemessagePageModule(int pageIndex, int pageSize, out long rowsCount, RB_Goods_Leavemessage_Extend query)
+        {
+            return goods_LeavemessageRepository.GetGoodsLeavemessagePageRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 新增商品留言
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetGoodsLeavemessageModule(RB_Goods_Leavemessage_Extend model)
+        {
+            var newId = goods_LeavemessageRepository.Insert(model);
+            model.Id = newId;
+            return newId > 0;
+        }
+
+        /// <summary>
+        /// 删除商品留言
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveGoodsLeavemessageModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_Goods_Leavemessage_Extend.Status),(int)DateStateEnum.Delete}
+            };
+            return goods_LeavemessageRepository.Update(fileds, new WhereHelper(nameof(RB_Goods_Leavemessage_Extend.Id), Id));
+        }
+    }
+}

Mall.Module.Product/ProductModule.cs

@@ -2507,6 +2507,7 @@ namespace Mall.Module.Product
                     form_id = model.FormsId,
                     sales = (model.SalesNum ?? 0) + payment_num,//已售出数量 + 订单商品数量//
                     name = model.Name,
+                    subname=model.SubName,
                     original_price = model.OriginalPrice,
                     cover_pic = model.CoverImage,
                     unit = model.Unit,
@@ -2582,6 +2583,10 @@ namespace Mall.Module.Product
                         x.CategoryName
                     }),
                     video_type = model.VideoType,
+                    goods_country=model.GoodsCountry,
+                    fatcode=model.FatCode,
+                    goodsurl= model.GoodsUrl,
+                    goodsLogo=model.goodsLogo,
                 },
                 delivery = ""
             };
@@ -7045,6 +7050,10 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.GoodsPageType),demodel.GoodsPageType },
                         { nameof(RB_Goods.IsNoTax),demodel.IsNoTax },
                         { nameof(RB_Goods.MinProfitRate),demodel.MinProfitRate },
+                        { nameof(RB_Goods.GoodsCountry),demodel.GoodsCountry },
+                        { nameof(RB_Goods.FatCode),demodel.FatCode },
+                        { nameof(RB_Goods.GoodsUrl),demodel.GoodsUrl },
+                        { nameof(RB_Goods.goodsLogo),demodel.goodsLogo },
                     };
                     if (goodsModel.IsProcurement == 1)
                     {

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -42,9 +42,9 @@ namespace Mall.Module.TradePavilion
         /// <param name="query"></param>
         /// <param name="isQuerySignup">是否查询报名名单</param>
         /// <returns></returns>
-        public List<RB_Commerce_Activity_Extend> GetCommerceActivityPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Activity_Extend query,bool isQuerySignup=false)
+        public List<RB_Commerce_Activity_Extend> GetCommerceActivityPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Activity_Extend query, bool isQuerySignup = false)
         {
-            var list= commerce_ActivityRepository.GetCommerceActivityPageListRepository(pageIndex, pageSize, out rowsCount, query);
+            var list = commerce_ActivityRepository.GetCommerceActivityPageListRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && isQuerySignup)
             {
                 string ids = string.Join(",", list.Select(qitem => qitem.Id));
@@ -61,6 +61,21 @@ namespace Mall.Module.TradePavilion
             return list;
         }
 
+        /// <summary>
+        /// 获取当前用户参加商会活动分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Activity_Extend> GetUserCommerceActivityPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Activity_Extend query)
+        {
+            var list = commerce_ActivityRepository.GetUserCommerceActivityPageRepository(pageIndex, pageSize, out rowsCount, query);
+
+            return list;
+        }
+
         /// <summary>
         /// 新增修改商户活动
         /// </summary>
@@ -81,6 +96,8 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Commerce_Activity_Extend.ActivityInfo),model.ActivityInfo },
                     {nameof(RB_Commerce_Activity_Extend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Commerce_Activity_Extend.UpdateDate),model.UpdateDate },
+                    {nameof(RB_Commerce_Activity_Extend.SignStartTime),model.SignStartTime },
+                    {nameof(RB_Commerce_Activity_Extend.SignEndTime),model.SignEndTime },
                 };
                 flag = commerce_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Activity_Extend.Id), model.Id));
             }

Mall.Module.TradePavilion/CommerceAskModule.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>
+    /// Fat咨询处理类
+    /// </summary>
+    public class CommerceAskModule
+    {
+        /// <summary>
+        /// Fat咨询仓储层对象
+        /// </summary>
+        private readonly RB_Commerce_AskRepository askRepository = new RB_Commerce_AskRepository();
+
+        /// <summary>
+        /// 获取FAT咨询分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Ask_Extend> GetCommerceAskPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Ask_Extend query)
+        {
+            return askRepository.GetCommerceAskPageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 新增修改Fat咨询
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetCommerceAskModule(RB_Commerce_Ask_Extend model)
+        {
+            bool flag = false;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Commerce_Ask_Extend.CompanyName),model.CompanyName },
+                    {nameof(RB_Commerce_Ask_Extend.Principal),model.Principal },
+                    {nameof(RB_Commerce_Ask_Extend.Mobile),model.Mobile },
+                    {nameof(RB_Commerce_Ask_Extend.EMail),model.EMail },
+                    {nameof(RB_Commerce_Ask_Extend.FatCode),model.FatCode },
+                    {nameof(RB_Commerce_Ask_Extend.FatTitle),model.FatTitle },
+                    {nameof(RB_Commerce_Ask_Extend.FatQuestion),model.FatQuestion },
+                    {nameof(RB_Commerce_Ask_Extend.FatContent),model.FatContent },
+                };
+                flag = askRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Ask_Extend.Id),model.Id));
+            }
+            else
+            {
+                var newId = askRepository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取Fat咨询详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_Commerce_Ask_Extend GetCommerceAskModule(object Id)
+        {
+            return askRepository.GetEntity<RB_Commerce_Ask_Extend>(Id);
+        }
+
+        /// <summary>
+        /// 更新咨询状态
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="Status"></param>
+        /// <returns></returns>
+        public bool RemoveCommerceAskModule(int Id, int Status)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Commerce_Ask_Extend.Status),Status },
+            };
+            bool flag = askRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Ask_Extend.Id), Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 回复问题
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool ReplyCommerceAskModule(RB_Commerce_Ask_Extend model)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Commerce_Ask_Extend.AskStatus),model.AskStatus },
+                {nameof(RB_Commerce_Ask_Extend.ReplyTime),model.ReplyTime },
+                {nameof(RB_Commerce_Ask_Extend.FatContent),model.FatContent },
+                {nameof(RB_Commerce_Ask_Extend.ReplyId),model.ReplyId },
+            };
+            return askRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Ask_Extend.Id), model.Id));
+        }
+    }
+}
\ No newline at end of file

Mall.Module.TradePavilion/CommerceCommentModule.cs

+using Mall.Common.Enum;
+using Mall.Model.Extend.TradePavilion;
+using Mall.Repository.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Module.TradePavilion
+{
+    /// <summary>
+    /// 活动评论处理类
+    /// </summary>
+    public class CommerceCommentModule
+    {
+        /// <summary>
+        /// 商会活动评论表仓储层对象
+        /// </summary>
+        private readonly RB_Commerce_CommentRepository commerce_CommentRepository = new RB_Commerce_CommentRepository();
+
+        /// <summary>
+        /// 获取活动评论分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Comment_Extend> GetCommerceCommentPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Comment_Extend query)
+        {
+            return commerce_CommentRepository.GetCommerceCommentPageRepository(pageIndex, pageSize, out rowsCount, query).ToList();
+        }
+
+        /// <summary>
+        /// 新增活动评论
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetCommerceCommentModule(RB_Commerce_Comment_Extend model)
+        {
+            var newId = commerce_CommentRepository.Insert(model);
+            model.Id = newId;
+            bool flag = newId > 0;
+            return flag;
+        }
+
+        /// <summary>
+        /// 删除活动评论
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveCommerceCommentModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Commerce_Comment_Extend.Id),(int)DateStateEnum.Delete }
+            };
+            return commerce_CommentRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Comment_Extend.Id), Id));
+        }
+    }
+}

Mall.Module.TradePavilion/CommerceConsultModule.cs

@@ -80,7 +80,28 @@ namespace Mall.Module.TradePavilion
             {
                 {nameof(RB_Commerce_Consult_Extend.Status),Status },
             };
-           bool flag = consultRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), Id));
+            bool flag = consultRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 取消商会活动报名状态
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="Status"></param>
+        /// <returns></returns>
+        public bool CancelCommerceConsultModule(int activityId, int userId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Commerce_Consult_Extend.Status),1 },
+            };
+            List<WhereHelper> list = new List<WhereHelper>()
+            {
+                new WhereHelper(nameof(RB_Commerce_Consult_Extend.ActivityId), activityId),
+                new WhereHelper(nameof(RB_Commerce_Consult_Extend.UserId), userId),
+            };
+            bool flag = consultRepository.Update(fileds, list);
             return flag;
         }
     }

Mall.Module.TradePavilion/CommerceNewsModule.cs

@@ -30,17 +30,6 @@ namespace Mall.Module.TradePavilion
             return commerce_NewsRepository.GetCommerceNewsPageListRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
-        /// <summary>
-        /// 获取新闻分页列表
-        /// </summary>
-        /// <param name="Top"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public List<RB_Commerce_News_Extend> GetCommerceNewsTopListModule(int Top, RB_Commerce_News_Extend query)
-        {
-            return commerce_NewsRepository.GetCommerceNewsTopListRepository(Top, query);
-        }
-
         /// <summary>
         /// 新增修改新闻
         /// </summary>
@@ -54,6 +43,7 @@ namespace Mall.Module.TradePavilion
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     { nameof(RB_Commerce_News_Extend.CoverImg),model.CoverImg},
+                    { nameof(RB_Commerce_News_Extend.Type),model.Type},
                     { nameof(RB_Commerce_News_Extend.Title),model.Title},
                     { nameof(RB_Commerce_News_Extend.Industry),model.Industry},
                     { nameof(RB_Commerce_News_Extend.PublishTime),model.PublishTime},

Mall.Module.TradePavilion/InvestmentProcurementModule.cs

@@ -107,5 +107,23 @@ namespace Mall.Module.TradePavilion
             return flag;
         }
 
+        /// <summary>
+        /// 采购/投资审核
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool AuditInvestmentProcurementModule(RB_InvestmentProcurement_Extend model)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_InvestmentProcurement_Extend.AuditStatus),model.AuditStatus },
+                {nameof(RB_InvestmentProcurement_Extend.AuditBy),model.AuditBy },
+                {nameof(RB_InvestmentProcurement_Extend.AuditTime),model.AuditTime },
+                {nameof(RB_InvestmentProcurement_Extend.AuditContent),model.AuditContent },
+            };
+            bool flag = repository.Update(fileds, new WhereHelper(nameof(RB_InvestmentProcurement_Extend.Id), model.Id));
+            return flag;
+        }
+
     }
 }

Mall.Repository/Product/RB_Goods_LeavemessageRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品留言表仓储层
+    /// </summary>
+    public class RB_Goods_LeavemessageRepository:BaseRepository<RB_Goods_Leavemessage>
+    {
+        /// <summary>
+        /// 获取商品留言分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Goods_Leavemessage_Extend> GetGoodsLeavemessagePageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Goods_Leavemessage_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Goods_Leavemessage AS A 
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Goods_Leavemessage_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Goods_Leavemessage_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Goods_Leavemessage_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Goods_Leavemessage_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.Content))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Goods_Leavemessage_Extend.Content));
+                    parameters.Add("Name", "%" + query.Content.Trim() + "%");
+                }
+                if (query.GoodsId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Goods_Leavemessage_Extend.GoodsId), query.GoodsId);
+                }
+            }
+            return GetPage<RB_Goods_Leavemessage_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+    }
+}

Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs

@@ -60,5 +60,59 @@ WHERE 1=1
             }
             return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 获取当前用户参加商会活动分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Activity_Extend> GetUserCommerceActivityPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Activity_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.TypeName,'') AS ActivityTypeName,IFNULL(C.JoinNum,0) AS JoinNum
+FROM rb_commerce_activity AS A LEFT JOIN rb_commerce_activitytype AS B ON A.ActivityType=B.Id
+     LEFT JOIN (SELECT ActivityId,COUNT(1) AS JoinNum  FROM rb_commerce_consult WHERE `Status`=0 GROUP BY ActivityId) AS C ON A.Id=C.ActivityId
+     INNER JOIN RB_Commerce_Consult AS D ON A.Id=D.ActivityId
+WHERE 1=1
+");
+            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>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.ActivityName))
+                {
+                    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);
+                }
+                //当前用户参加的活动
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND D.{0}={1} ", nameof(RB_Commerce_Consult_Extend.UserId), query.CreateBy);
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Commerce_Activity_Extend.Id));
+            return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
     }
 }

Mall.Repository/TradePavilion/RB_Commerce_AskRepository.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>
+    /// FAT咨询仓储层
+    /// </summary>
+    public class RB_Commerce_AskRepository:BaseRepository<RB_Commerce_Ask>
+    {
+        /// <summary>
+        /// 获取FAT咨询分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Ask_Extend> GetCommerceAskPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Ask_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Commerce_Ask AS A  
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Ask_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Commerce_Ask_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Ask_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Ask_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.FatTitle))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Commerce_Ask_Extend.FatTitle));
+                    parameters.Add("Name", "%" + query.FatTitle.Trim() + "%");
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Ask_Extend.CreateBy), query.CreateBy);
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Commerce_Ask_Extend.Id));
+            return GetPage<RB_Commerce_Ask_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_Commerce_CommentRepository.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_CommentRepository:BaseRepository<RB_Commerce_Comment>
+    {
+        /// <summary>
+        /// 获取活动评论分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Comment_Extend> GetCommerceCommentPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Comment_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM rb_commerce_comment
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Comment_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Commerce_Comment_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Comment_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Comment_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.Content))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Comment_Extend.Content));
+                    parameters.Add("Name", "%" + query.Content.Trim() + "%");
+                }
+                if (query.ActivityId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Comment_Extend.ActivityId), query.ActivityId);
+                }
+            }
+            return GetPage<RB_Commerce_Comment_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    
+    }
+}
\ No newline at end of file

Mall.Repository/TradePavilion/RB_Commerce_ConsultRepository.cs

@@ -48,6 +48,10 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Consult_Extend.LinkMan));
                     parameters.Add("Name", "%" + query.LinkMan.Trim() + "%");
                 }
+                if (query.ActivityId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.ActivityId), query.ActivityId);
+                }
                 if (!string.IsNullOrEmpty(query.QActivityIds))
                 {
                     builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Commerce_Consult_Extend.ActivityId), query.QActivityIds);

Mall.Repository/TradePavilion/RB_Commerce_NewsRepository.cs

@@ -47,45 +47,9 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.MallBaseId), query.MallBaseId);
                 }
-                if (!string.IsNullOrEmpty(query.Title))
+                if (query.Type > 0)
                 {
-                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Commerce_News_Extend.Title));
-                    parameters.Add("Name", "%" + query.Title.Trim() + "%");
-                }
-            }
-            return GetPage<RB_Commerce_News_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
-        }
-
-
-        /// <summary>
-        /// 获取新闻分页列表
-        /// </summary>
-        /// <param name="Top"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public List<RB_Commerce_News_Extend> GetCommerceNewsTopListRepository(int Top, RB_Commerce_News_Extend query)
-        {
-            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);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.Type), query.Type);
                 }
                 if (!string.IsNullOrEmpty(query.Title))
                 {
@@ -93,12 +57,8 @@ WHERE 1=1
                     parameters.Add("Name", "%" + query.Title.Trim() + "%");
                 }
             }
-            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Commerce_News_Extend.PublishTime));
-            if (Top > 0)
-            {
-                builder.AppendFormat(" LIMIT {0} ", Top);
-            }
-            return Get<RB_Commerce_News_Extend>(builder.ToString(), parameters).ToList();
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Commerce_News_Extend.Id));
+            return GetPage<RB_Commerce_News_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
     }
 }

Mall.Repository/TradePavilion/RB_InvestmentProcurementRepository.cs

@@ -57,7 +57,12 @@ WHERE 1=1
                     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_InvestmentProcurement_Extend.CreateBy), query.CreateBy);
+                }
             }
+            builder.AppendFormat(" ORDER BY {0} DESC ", nameof(RB_InvestmentProcurement_Extend.Id));
             return GetPage<RB_InvestmentProcurement_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
     }

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -2689,6 +2689,7 @@ namespace Mall.WebApi.Controllers
                 is_show_sales_num = mallBaseModel?.ListBuyCount,
                 is_show_goods_name = mallBaseModel?.ListName,
                 is_show_goods_price = mallBaseModel?.IsShowPrice ?? 0,//是否显示商品价格【hk2020-02-21新增】
+                is_show_korea= miniProgram?.IsKorea??0,//是否是韩国馆(1-是)
                 is_underline_price = mallBaseModel?.DetailsLineationPrice,
                 is_express = mallBaseModel?.DeatilsExpress,
                 is_not_share_show = mallBaseModel?.OtherNoShare,

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -30,6 +30,11 @@ namespace Mall.WebApi.Controllers.MallBase
         private readonly ProductModule productModule = new ProductModule();
         private readonly OrderModule_V2 orderModule = new OrderModule_V2();
 
+        /// <summary>
+        /// 商品留言处理类对象
+        /// </summary>
+        private readonly GoodsLeavemessageModule goodsLeavemessage = new GoodsLeavemessageModule();
+
         #region 商品分类
 
         /// <summary>
@@ -226,11 +231,12 @@ namespace Mall.WebApi.Controllers.MallBase
                 {
                     memberGrade = productModule.GetMemberGradeList(new RB_Member_Grade_Extend() { Id = userModel.MemberGrade ?? 0, Enabled = 1, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
                 }
-                if (demodel.SmallShopsId == 0) {
+                if (demodel.SmallShopsId == 0)
+                {
                     demodel.SmallShopsId = userModel.SmallShopId;
                 }
             }
-            var list = productModule.GetAppletGoodsPageListForZY(pagelist.pageIndex, pagelist.pageSize, out long count, demodel,IsGetShare:IsGetShare,GoodsClassify: GoodsClassify);
+            var list = productModule.GetAppletGoodsPageListForZY(pagelist.pageIndex, pagelist.pageSize, out long count, demodel, IsGetShare: IsGetShare, GoodsClassify: GoodsClassify);
             List<object> RList = new List<object>();
             if (list.Any())
             {
@@ -361,6 +367,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         id = model.Id,
                         sign = "",
                         name = model.Name,
+                        subName = model.SubName,
                         cover_pic = model.CoverImage,
                         video_url = model.VideoAddress,
                         original_price = model.OriginalPrice,
@@ -390,12 +397,12 @@ namespace Mall.WebApi.Controllers.MallBase
                         attr = priceList,
                         goods_stock = model.InventoryNum,
                         goods_num = model.InventoryNum,
-                        marketingLogo= model.MarketingLogo,
-                        video_type=model.VideoType,
-                        erpgoodobj=model.ERPGoodObj,
-                        isChooseServicePerson= model.IsChooseServicePerson,
-                        depositMoney= model.DepositMoney,
-                        goodsclassify= model.GoodsClassify
+                        marketingLogo = model.MarketingLogo,
+                        video_type = model.VideoType,
+                        erpgoodobj = model.ERPGoodObj,
+                        isChooseServicePerson = model.IsChooseServicePerson,
+                        depositMoney = model.DepositMoney,
+                        goodsclassify = model.GoodsClassify
                     });
                 }
             }
@@ -448,12 +455,12 @@ namespace Mall.WebApi.Controllers.MallBase
             int servicePersionId = prams.GetInt("servicePersionId", 0);
             //选择的日期
             string chooseDate = prams.GetStringValue("chooseDate");
-            if (StoreId<=0 || GoodsId<=0)
+            if (StoreId <= 0 || GoodsId <= 0)
             {
-                return ApiResult.ParamIsNull(message:"请选择门店");
+                return ApiResult.ParamIsNull(message: "请选择门店");
             }
             int UserId = req.UserId;
-            object Robj = productModule.GetAppletOfflineGoodsInfoModule(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId, storeId: StoreId,servicePersionId:servicePersionId,chooseDate:chooseDate);
+            object Robj = productModule.GetAppletOfflineGoodsInfoModule(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId, storeId: StoreId, servicePersionId: servicePersionId, chooseDate: chooseDate);
             return ApiResult.Success("", Robj);
         }
 
@@ -541,7 +548,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             JObject prams = JObject.Parse(req.msg.ToString());
             int StoreId = prams.GetInt("StoreId", 0);
-            string categoryIds= prams.GetStringValue("categoryIds");
+            string categoryIds = prams.GetStringValue("categoryIds");
             if (StoreId <= 0)
             {
                 return ApiResult.ParamIsNull(message: "请选择门店");
@@ -1145,7 +1152,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 {
                     memberGrade = productModule.GetMemberGradeList(new RB_Member_Grade_Extend() { Id = userModel.MemberGrade ?? 0, Enabled = 1, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
                 }
-                if (demodel.SmallShopsId == 0) {
+                if (demodel.SmallShopsId == 0)
+                {
                     demodel.SmallShopsId = userModel.SmallShopId;
                 }
             }
@@ -1305,7 +1313,8 @@ namespace Mall.WebApi.Controllers.MallBase
                         }),
                         attr = priceList,
                         goods_stock = model.InventoryNum,
-                        goods_num = model.InventoryNum
+                        goods_num = model.InventoryNum,
+                        subName=model.SubName
                     });
                 }
             }
@@ -1375,5 +1384,75 @@ namespace Mall.WebApi.Controllers.MallBase
             return orderModule.GetAppletMyOrderAgentInfo(OrderId);
         }
         #endregion
+
+        #region 商品留言管理
+        /// <summary>
+        /// 获取商品留言分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetGoodsLeaveMessagePage(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (parms.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            var demodel = JsonConvert.DeserializeObject<RB_Goods_Leavemessage_Extend>(parms.msg.ToString());
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = goodsLeavemessage.GetGoodsLeavemessagePageModule(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list;
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 新增商品留言
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetGoodsLeavemessage(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (parms.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            var userModel = productModule.GetMemberUserInfo(parms.UserId);
+            var demodel = JsonConvert.DeserializeObject<RB_Goods_Leavemessage_Extend>(parms.msg.ToString());
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.CreateTime = DateTime.Now;
+            demodel.UserId = parms.UserId;
+            demodel.UserName = userModel?.Name ?? "";
+            demodel.UserPhoto = userModel?.Photo ?? "";
+            var flag = goodsLeavemessage.SetGoodsLeavemessageModule(demodel);
+            return flag ? ApiResult.Success("") : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 删除商品评论
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveGoodsLeavemessage(object requestMsg)
+        {
+            var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (req.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int Id = parms.GetInt("Id", 0);
+            if (Id <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            var flag = goodsLeavemessage.RemoveGoodsLeavemessageModule(Id);
+            return flag ? ApiResult.Success("") : ApiResult.Failed();
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1779,6 +1779,10 @@ namespace Mall.WebApi.Controllers.MallBase
                     model?.VideoType,
                     model?.IntegralComment,
                     model?.IntegralCommentType,
+                    model?.GoodsCountry,
+                    model?.FatCode,
+                    model?.GoodsUrl,
+                    model?.goodsLogo,
                 };
             }
             return ApiResult.Success("", obj);
@@ -1792,6 +1796,8 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult SetProductGoodsInfo()
         {
             var parms = RequestParm;
+            JObject prams = JObject.Parse(parms.msg.ToString());
+            int IsKorea = prams.GetInt("IsKorea", 0);//是否为韩国馆项目(1-是)
             RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
@@ -1805,15 +1811,15 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.ParamIsNull("请添加商品轮播图");
             }
             demodel.CarouselImage = JsonConvert.SerializeObject(demodel.CarouselImageList.Select(x => x.Path));
-            if ((demodel.SellingPrice ?? 0) < 0)
+            if (IsKorea ==0&&(demodel.SellingPrice ?? 0) < 0)
             {
                 return ApiResult.ParamIsNull("请输入售价");
             }
-            if ((demodel.OriginalPrice ?? 0) <= 0)
+            if (IsKorea == 0 && (demodel.OriginalPrice ?? 0) <= 0)
             {
                 return ApiResult.ParamIsNull("请输入原价");
             }
-            if (string.IsNullOrEmpty(demodel.Unit))
+            if (IsKorea == 0 && string.IsNullOrEmpty(demodel.Unit))
             {
                 return ApiResult.ParamIsNull("请输入单位");
             }
@@ -1921,7 +1927,15 @@ namespace Mall.WebApi.Controllers.MallBase
                     {
                         demodel.SellingPrice = SellingPrice;
                     }
-                    demodel.MinProfitRate = demodel.SpecificationPriceList.Where(x => x.SellingPrice > 0 && x.CostMoney > 0 && x.Commission > 0)?.Min(x => Math.Round(((x.SellingPrice ?? 0) - x.CostMoney - x.Commission) / (x.SellingPrice ?? 0), 2, MidpointRounding.AwayFromZero)) ?? 0;
+                    try
+                    {
+                        demodel.MinProfitRate = demodel.SpecificationPriceList.Where(x => x.SellingPrice > 0 && x.CostMoney > 0 && x.Commission > 0)?.Min(x => Math.Round(((x.SellingPrice ?? 0) - x.CostMoney - x.Commission) / (x.SellingPrice ?? 0), 2, MidpointRounding.AwayFromZero)) ?? 0;
+                    }
+
+                    catch
+                    { 
+                    
+                    }
                 }
 
                 //分销佣金

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -51,6 +51,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         private readonly CommerceNewsModule commerceNewsModule = new CommerceNewsModule();
 
+
+        /// <summary>
+        /// Fat资料处理类对象
+        /// </summary>
+        private readonly CommerceAskModule askModule = new CommerceAskModule();
+
         #region 联系人管理
 
         /// <summary>
@@ -195,53 +201,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
-        /// <summary>
-        /// 新增修改投资采购
-        /// </summary>
-        /// <returns></returns>
-        public ApiResult SetInvestmentProcurement()
-        {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var extModel = new RB_InvestmentProcurement_Extend()
-            {
-                Id = parms.GetInt("Id"),
-                Type = parms.GetInt("Type"),
-                GoodsCategory = parms.GetStringValue("GoodsCategory"),
-                Investment = parms.GetStringValue("Investment"),
-                ImportNum = parms.GetInt("ImportNum"),
-                Describe = parms.GetStringValue("Describe"),
-                CompanyName = parms.GetStringValue("CompanyName"),
-                CompanyEnName = parms.GetStringValue("CompanyEnName"),
-                Mobile = parms.GetStringValue("Mobile"),
-                EMail = parms.GetStringValue("EMail"),
-                LegalPerson = parms.GetStringValue("LegalPerson"),
-                Principal = parms.GetStringValue("Principal"),
-                WechatNo = parms.GetStringValue("WechatNo"),
-                DomainUrl = parms.GetStringValue("DomainUrl"),
-                Industry = parms.GetStringValue("Industry"),
-                FoundingTime = parms.GetDateTime("FoundingTime"),
-                EmployeeNum = parms.GetInt("EmployeeNum"),
-                AnnualSales = parms.GetDecimal("AnnualSales"),
-                Address = parms.GetStringValue("Address"),
-                EnAddress = parms.GetStringValue("EnAddress"),
-                AnnualImport = parms.GetDecimal("AnnualImport"),
-                ImportCategory = parms.GetStringValue("ImportCategory"),
-                ImportCountry = parms.GetStringValue("ImportCountry"),
-                ExportCountry = parms.GetStringValue("ExportCountry"),
-                CompanyIntro = parms.GetStringValue("CompanyIntro"),
-                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 = procurementModule.SetInvestmentProcurementModule(extModel);
-            return flag ? ApiResult.Success() : ApiResult.Failed();
-        }
+        
 
         /// <summary>
         /// 获取投资采购详情
@@ -267,6 +227,26 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var flag = procurementModule.RemoveInvestmentProcurementModule(Id, Status);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        /// <summary>
+        /// 投资采购审核
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult AutitInvestmentProcurement()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            Int32.TryParse(RequestParm.uid, out int Uid);
+            var extModel = new RB_InvestmentProcurement_Extend()
+            {
+                Id = parms.GetInt("Id"),
+                AuditStatus=parms.GetInt("AuditStatus"),
+                AuditTime = DateTime.Now,
+                AuditBy = Uid,
+                AuditContent = parms.GetStringValue("AuditContent")
+            };
+            var flag = procurementModule.AuditInvestmentProcurementModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
         #endregion
 
         #region 公司信息管理
@@ -356,6 +336,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 CoverImg = jObj.GetStringValue("CoverImg"),
                 ActivityType = jObj.GetInt("ActivityType"),
                 ActivityInfo = jObj.GetStringValue("ActivityInfo"),
+                SignStartTime=jObj.GetDateTime("SignStartTime"),
+                SignEndTime = jObj.GetDateTime("SignEndTime"),
             };
             try
             {
@@ -550,7 +532,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Commerce_News_Extend()
             {
-                Title = parms.GetStringValue("Title")
+                Title = parms.GetStringValue("Title"),
+                Type=parms.GetInt("Type"),
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
@@ -601,6 +584,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Industry = jObj.GetStringValue("Industry"),
                 PublishTime = jObj.GetDateTime("PublishTime"),
                 NewsInfo = jObj.GetStringValue("NewsInfo"),
+                Type=jObj.GetInt("Type"),
             };
             extModel.Status = Common.Enum.DateStateEnum.Normal;
             extModel.MallBaseId = RequestParm.MallBaseId;
@@ -614,5 +598,59 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
         #endregion
+
+        #region 咨询管理
+        /// <summary>
+        /// 获取投资采购分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceAskPage()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_Ask_Extend()
+            {
+                CompanyName = parms.GetStringValue("CompanyName"),
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = askModule.GetCommerceAskPageListModule(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 GetCommerceAskInfo()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var extModel = askModule.GetCommerceAskModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 获取新闻信息详情
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult ReplyCommerceAsk()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            Int32.TryParse(RequestParm.uid, out int Uid);
+            var model = new RB_Commerce_Ask_Extend()
+            {
+                Id = parms.GetInt("Id", 0),
+                AskStatus = parms.GetInt("AskStatus"),
+                ReplyTime =DateTime.Now,
+                FatContent=parms.GetStringValue("FatContent"),
+                ReplyId= Uid
+            };
+            var extModel = askModule.ReplyCommerceAskModule(model);
+            return ApiResult.Success(data: extModel);
+        }
+        #endregion
     }
 }

Mall.WebApi/Controllers/User/TenantController.cs

@@ -203,6 +203,7 @@ namespace Mall.WebApi.Controllers.User
                     ERPBranchId = (erpUserInfo?.RB_Branch_id ?? -1),
                     ERPGroupId = (erpUserInfo?.RB_Group_id ?? 0),
                     IsOpenSchool = 0,
+                    IsKorea=0,
                 };
                 UserReidsCache.UserInfoSet(UserModuleCacheKeyConfig.Mall_Login_Info + model.TenantId, obj, Config.JwtExpirTime);
                 return ApiResult.Success("", obj);
@@ -1606,7 +1607,9 @@ namespace Mall.WebApi.Controllers.User
             //是否隐藏商品【1-隐藏】
             int IsHiddenGoods = parms.GetInt("IsHiddenGoods");
             List<object> resultList = new List<object>();
-            var pageList = programPageModule.GetMiniprogram_Page_ListExtModule(new RB_MiniProgram_Page_Extend() { MallBaseId = RequestParm.MallBaseId });
+            var query = new RB_MiniProgram_Page_Extend() { MallBaseId = RequestParm.MallBaseId };
+
+            var pageList = programPageModule.GetMiniprogram_Page_ListExtModule(query);
             var pageTypeList = Common.Plugin.EnumHelper.EnumToList(typeof(PageTypeEnum));
             foreach (var item in pageTypeList)
             {

Test/Program.cs

 using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,9 +13,58 @@ namespace Test
         static void Main(string[] args)
         {
             Console.WriteLine("Start......");
-            Helper.FreightRulesHelper.GetData();
+            //Helper.FreightRulesHelper.GetData();
+
+            //Test();
             Console.WriteLine("End......");
             Console.ReadLine();
         }
+
+        public class FileModel
+        { 
+          public int Id { get; set; }
+
+            public string FilePath { get; set; }
+        }
+
+        public static void Test()
+        {
+            //获取到pic下面的jpg图片
+            List<FileModel> fileList = new List<FileModel>();
+            string[] rs = System.IO.Directory.GetFiles(@"C:\Users\qiaoyajun\Desktop\ppt", "*.png");
+            foreach (var item in rs)
+            {
+                var fileName = System.IO.Path.GetFileNameWithoutExtension(item);
+                Int32.TryParse(fileName, out int FileNum);
+                var fileModel = new FileModel()
+                {
+                    Id = FileNum,
+                    FilePath = item
+                };
+                fileList.Add(fileModel);
+            }
+            var newFileList = fileList.OrderBy(qitem => qitem.Id).ToList();
+            //最大宽度和高度
+            int maL = 959, totalH = 18292;
+ 
+            Bitmap map = new Bitmap(maL, totalH);//定义画布
+            Graphics g = Graphics.FromImage(map);//定义画笔
+            g.Clear(Color.White);//把画布更改为白色
+            int y = 0;//y轴坐标
+            for (int i = 0; i < newFileList.Count; i++)
+            {
+                Image image = Image.FromStream(new System.IO.MemoryStream(File.ReadAllBytes(newFileList[i].FilePath)));
+                g.DrawImage(image, new Point(0, y));
+                y = y + 538;//y的告诉 5是为了让画布有个缝隙
+            }
+            //把合并的图片进行保存为jpg格式
+            map.Save(@"C:\Users\qiaoyajun\Desktop\HK\1.jpg", System.Drawing.Imaging.ImageFormat.Jpeg);
+            for (int i = 0; i < rs.Length; i++)
+            {
+                //删除原先的2个jpg图片
+                //File.Delete(rs[i]);
+            }
+
+        }
     }
 }

Test/Test.csproj

@@ -58,6 +58,7 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />