Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/TradePavilion/RB_Commerce_Activity.cs

+using Mall.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 商会活动表实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Commerce_Activity
+    {
+		/// <summary>
+		/// 活动编号(主键)
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 活动名称
+		/// </summary>
+		public string ActivityName { get; set; }
+
+		/// <summary>
+		/// 开始时间
+		/// </summary>
+		public DateTime StartTime { get; set; }
+
+		/// <summary>
+		/// 结束时间
+		/// </summary>
+		public DateTime EndTime { get; set; }
+
+		/// <summary>
+		/// 封面图
+		/// </summary>
+		public string CoverImg { get; set; }
+
+		/// <summary>
+		/// 活动类型(rb_commerce_activitytype表Id)
+		/// </summary>
+		public int? ActivityType { get; set; }
+
+		/// <summary>
+		/// 活动详情
+		/// </summary>
+		public string ActivityInfo { 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/Entity/TradePavilion/RB_Commerce_ActivityType.cs

+using Mall.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 商会活动类型表实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Commerce_ActivityType
+    {
+        /// <summary>
+        /// 活动类型编号(主键)
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string TypeName { 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/Entity/TradePavilion/RB_Commerce_Details.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 商会活动详情表实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Commerce_Details
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 活动编号
+		/// </summary>
+		public int ActivityId { get; set; }
+
+		/// <summary>
+		/// 商品编号
+		/// </summary>
+		public int GoodsId { get; set; }
+	}
+}

Mall.Model/Extend/TradePavilion/RB_Commerce_ActivityType_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_ActivityType_Extend: RB_Commerce_ActivityType
+    {
+
+    }
+}
\ No newline at end of file

Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_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_Activity_Extend: RB_Commerce_Activity
+    {
+        /// <summary>
+        /// 商会活动详情列表
+        /// </summary>
+        public List<RB_Commerce_Details_Extend> CommerceDetailsList { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Commerce_Details_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_Details_Extend: RB_Commerce_Details
+    {
+
+        /// <summary>
+        /// 活动编号【查询使用】
+        /// </summary>
+        public string QActivityIds { get; set; }
+    }
+}

Mall.Model/Mall.Model.csproj

@@ -5,8 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="CacheEntity\**" />
     <Compile Remove="Query\Applet\**" />
+    <EmbeddedResource Remove="CacheEntity\**" />
     <EmbeddedResource Remove="Query\Applet\**" />
+    <None Remove="CacheEntity\**" />
     <None Remove="Query\Applet\**" />
   </ItemGroup>
 
@@ -14,10 +17,6 @@
     <Compile Remove="Extend\BaseSetUp\RB_Logistics_Pinkage_Extend.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="CacheEntity\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="VT.FW" Version="1.0.1" />
   </ItemGroup>

Mall.Module.TradePavilion/CommerceActivityModule.cs

+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 CommerceActivityModule
+    {
+        /// <summary>
+        /// 商会活动仓储层对象
+        /// </summary>
+        private readonly RB_Commerce_ActivityRepository commerce_ActivityRepository = new RB_Commerce_ActivityRepository();
+
+        /// <summary>
+        /// 商会活动类型表仓储层对象
+        /// </summary>
+        private readonly RB_Commerce_ActivityTypeRepository activityTypeRepository = new RB_Commerce_ActivityTypeRepository();
+
+        /// <summary>
+        /// 商会活动详情表仓储层对象
+        /// </summary>
+        private readonly RB_Commerce_DetailsRepository detailsRepository = new RB_Commerce_DetailsRepository();
+
+        #region 商户活动管理
+
+        /// <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> GetCommerceActivityPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Activity_Extend query)
+        {
+            return commerce_ActivityRepository.GetCommerceActivityPageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 新增修改商户活动
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetCommerceActivityModule(RB_Commerce_Activity_Extend model)
+        {
+            bool flag;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Commerce_Activity_Extend.ActivityName),model.ActivityName },
+                    {nameof(RB_Commerce_Activity_Extend.StartTime),model.StartTime },
+                    {nameof(RB_Commerce_Activity_Extend.EndTime),model.EndTime },
+                    {nameof(RB_Commerce_Activity_Extend.CoverImg),model.CoverImg },
+                    {nameof(RB_Commerce_Activity_Extend.ActivityType),model.ActivityType },
+                    {nameof(RB_Commerce_Activity_Extend.ActivityInfo),model.ActivityType },
+                    {nameof(RB_Commerce_Activity_Extend.UpdateBy),model.UpdateBy },
+                    {nameof(RB_Commerce_Activity_Extend.UpdateDate),model.UpdateDate },
+                };
+                flag = commerce_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Activity_Extend.Id), model.Id));
+            }
+            else
+            {
+                var newId = commerce_ActivityRepository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+
+            //原来的活动详情
+            var oldDetailsList = GetCommerceDetailsListModule(new RB_Commerce_Details_Extend() { ActivityId = model.Id });
+
+            //以前没有活动详情【直接新增】
+            if (oldDetailsList == null || (oldDetailsList != null && oldDetailsList.Count == 0))
+            {
+                if (model.CommerceDetailsList != null && model.CommerceDetailsList.Count > 0)
+                {
+                    foreach (var item in model.CommerceDetailsList)
+                    {
+                        item.ActivityId = model.Id;
+                        detailsRepository.Insert(item);
+                    }
+                }
+            }
+            else//以前有活动详情
+            {
+                //现在没有阶梯报价了【直接删除以前的阶梯报价】
+                if (model.CommerceDetailsList == null || (model.CommerceDetailsList != null && model.CommerceDetailsList.Count == 0))
+                {
+                    detailsRepository.DeleteCommerceDetailsRepository(model.Id);
+                }
+                //找出差异的数据
+                var deleteList = oldDetailsList.Where(qitem => !model.CommerceDetailsList.Any(oldItem => qitem.ActivityId == oldItem.ActivityId)).ToList();
+                foreach (var dItem in deleteList)
+                {
+                    if (dItem.Id > 0)
+                    {
+                        detailsRepository.Delete(dItem.Id);
+                    }
+                }
+                foreach (var priceItem in model.CommerceDetailsList)
+                {
+                    priceItem.ActivityId = model.Id;
+                    if (priceItem.Id == 0)
+                    {
+                        detailsRepository.Insert(priceItem);
+                    }
+                    else
+                    {
+                        detailsRepository.Update(priceItem);
+                    }
+                }
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取修改商户活动详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_Commerce_Activity_Extend GetCommerceActivityModule(object Id)
+        {
+            return commerce_ActivityRepository.GetEntity<RB_Commerce_Activity_Extend>(Id);
+        }
+
+        /// <summary>
+        /// 更新商户活动状态
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="Status"></param>
+        /// <returns></returns>
+        public bool RemoveCommerceActivityModule(int Id, int Status)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Commerce_Activity_Extend.Status),Status },
+            };
+            bool flag = commerce_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Activity_Extend.Id), Id));
+            return flag;
+        }
+
+        #endregion
+
+        #region 商户活动类型管理
+
+        /// <summary>
+        /// 获取商会活动类型分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_ActivityType_Extend> GetCommerceActivityTypePageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_ActivityType_Extend query)
+        {
+            return activityTypeRepository.GetCommerceActivityTypePageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 新增修改商会活动类型
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetCommerceActivityTypeModule(RB_Commerce_ActivityType_Extend model)
+        {
+            bool flag;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Commerce_ActivityType_Extend.TypeName),model.TypeName },
+                    {nameof(RB_Commerce_ActivityType_Extend.UpdateBy),model.UpdateBy },
+                    {nameof(RB_Commerce_ActivityType_Extend.UpdateDate),model.UpdateDate }
+                };
+                flag = activityTypeRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_ActivityType_Extend.Id), model.Id));
+            }
+            else
+            {
+                var newId = activityTypeRepository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取商会活动类型详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_Commerce_ActivityType_Extend GetCommerceActivityTypeModule(object Id)
+        {
+            return activityTypeRepository.GetEntity<RB_Commerce_ActivityType_Extend>(Id);
+        }
+
+        /// <summary>
+        /// 更新商户活动类型状态
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="Status"></param>
+        /// <returns></returns>
+        public bool RemoveCommerceActivityTypeModule(int Id, int Status)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Commerce_ActivityType_Extend.Status),Status },
+            };
+            bool flag = activityTypeRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_ActivityType_Extend.Id), Id));
+            return flag;
+        }
+
+        #endregion
+
+        #region 商会活动详情管理
+
+        /// <summary>
+        /// 获取商会活动详情列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Details_Extend> GetCommerceDetailsListModule(RB_Commerce_Details_Extend query)
+        {
+            return detailsRepository.GetCommerceDetailsListRepository(query);
+        }
+
+        #endregion
+    }
+}

Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.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_ActivityRepository : BaseRepository<RB_Commerce_Activity>
+    {
+        /// <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> GetCommerceActivityPageListRepository(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 * 
+FROM RB_Commerce_Activity
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {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 {0}={1} ", nameof(RB_Commerce_Activity_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Activity_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.ActivityName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Activity_Extend.ActivityName));
+                    parameters.Add("Name", "%" + query.ActivityName.Trim() + "%");
+                }
+            }
+            return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_Commerce_ActivityTypeRepository.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_ActivityTypeRepository : BaseRepository<RB_Commerce_ActivityType>
+    {
+        /// <summary>
+        /// 获取商会活动类型分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_ActivityType_Extend> GetCommerceActivityTypePageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_ActivityType_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Commerce_ActivityType
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Commerce_ActivityType_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.TypeName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_ActivityType_Extend.TypeName));
+                    parameters.Add("Name", "%" + query.TypeName.Trim() + "%");
+                }
+            }
+            return GetPage<RB_Commerce_ActivityType_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_Commerce_DetailsRepository.cs

+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_DetailsRepository : BaseRepository<RB_Commerce_Details>
+    {
+        /// <summary>
+        /// 获取商会活动详情列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Details_Extend> GetCommerceDetailsListRepository(RB_Commerce_Details_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Commerce_Details
+WHERE 1=1
+");
+ 
+            if (query == null)
+            {
+                return new List<RB_Commerce_Details_Extend>();
+            }
+            else
+            {
+                if (query.ActivityId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Details_Extend.ActivityId), query.ActivityId);
+                }
+                if (!string.IsNullOrEmpty(query.QActivityIds))
+                {
+                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Commerce_Details_Extend.ActivityId), query.QActivityIds);
+                }
+            }
+            return Get<RB_Commerce_Details_Extend>(builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 根据活动编号删除活动详情
+        /// </summary>
+        /// <param name="ActivityId"></param>
+        /// <returns></returns>
+        public bool DeleteCommerceDetailsRepository(int ActivityId)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(" DELETE FROM RB_Commerce_Details WHERE ActivityId={0} ", ActivityId);
+            return base.Execute(builder.ToString()) > 0;
+        }
+    }
+}
\ No newline at end of file

Mall.Repository/TradePavilion/RB_InvestmentProcurementRepository.cs

@@ -33,7 +33,7 @@ SELECT *
 FROM RB_InvestmentProcurement
 WHERE 1=1
 ");
-            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_InvestmentProcurement_Extend.Status), (int)DateStateEnum.Normal);
             if (query == null)
             {
                 return new List<RB_InvestmentProcurement_Extend>();