代码优化

Mall.Model/Extend/TradePavilion/RB_Commerce_Details_Extend.cs

@@ -10,5 +10,10 @@ namespace Mall.Model.Extend.TradePavilion
     /// </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.Text;
+
+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();
+
+        /// <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="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="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Details_Extend> GetCommerceDetailsListModule(RB_Commerce_Details_Extend query)
+        {
+            return detailsRepository.GetCommerceDetailsListRepository(query);
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs

-using Mall.Model.Entity.TradePavilion;
+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
 {
@@ -10,6 +14,46 @@ namespace Mall.Repository.TradePavilion
     /// </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.Model.Entity.TradePavilion;
+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
 {
@@ -10,5 +14,46 @@ namespace Mall.Repository.TradePavilion
     /// </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
 {
@@ -10,6 +13,37 @@ namespace Mall.Repository.TradePavilion
     /// </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();
+        }
     }
 }
\ 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>();

Mall.WebApi/Mall.WebApi.csproj

@@ -41,6 +41,7 @@
     <ProjectReference Include="..\Mall.Module.Product\Mall.Module.Product.csproj" />
     <ProjectReference Include="..\Mall.Module.Property\Mall.Module.Property.csproj" />
     <ProjectReference Include="..\Mall.Module.Reserve\Mall.Module.Reserve.csproj" />
+    <ProjectReference Include="..\Mall.Module.TradePavilion\Mall.Module.TradePavilion.csproj" />
     <ProjectReference Include="..\Mall.Module.User\Mall.Module.User.csproj" />
     <ProjectReference Include="..\Mall.ThirdCore\Mall.ThirdCore.csproj" />
   </ItemGroup>