新增接口

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>

Mall.Module.TradePavilion/CommerceConsultModule.cs

@@ -83,5 +83,26 @@ namespace Mall.Module.TradePavilion
             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.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs

@@ -60,5 +60,58 @@ 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);
+                }
+            }
+            return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
     }
 }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -122,9 +122,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var query = new RB_Commerce_ActivityType_Extend();
             var userInfo = AppletUserInfo;
             query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = userInfo?.TenantId??0;
+            query.TenantId = userInfo?.TenantId ?? 0;
             var list = activityModule.GetCommerceActivityTypeListModule(query);
-            return ApiResult.Success(data: list.Select(qitem=>new { qitem.Id,qitem.CoverImage,qitem.TypeName}));
+            return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.CoverImage, qitem.TypeName }));
         }
 
         /// <summary>
@@ -137,7 +137,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject jObj = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Commerce_Activity_Extend()
             {
-                 ActivityType= jObj.GetInt("ActivityType")
+                ActivityType = jObj.GetInt("ActivityType")
             };
             var userInfo = AppletUserInfo;
             query.MallBaseId = RequestParm.MallBaseId;
@@ -188,7 +188,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var userInfo = AppletUserInfo;
             extModel.MallBaseId = RequestParm.MallBaseId;
             extModel.TenantId = userInfo?.TenantId ?? 0;
-            extModel.CreateBy = userInfo?.UserId??0;
+            extModel.CreateBy = userInfo?.UserId ?? 0;
             extModel.CreateDate = DateTime.Now;
             extModel.UpdateBy = userInfo?.UserId ?? 0; ;
             extModel.UpdateDate = DateTime.Now;
@@ -208,31 +208,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: extModel);
         }
 
-        /// <summary>
-        /// 新增修改商会活动报名
-        /// </summary>
-        /// <returns></returns>
-        public ApiResult SetCommerceConsult()
-        {
-            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
-            var extModel = new RB_Commerce_Consult_Extend()
-            {
-                Id = jObj.GetInt("Id"),
-                ActivityId = jObj.GetInt("ActivityId"),
-                UserId = jObj.GetInt("UserId"),
-                LinkMan = jObj.GetStringValue("LinkMan"),
-                LinkTel = jObj.GetStringValue("LinkTel"),
-            };
-            var userInfo = AppletUserInfo;
-            extModel.Status = Common.Enum.DateStateEnum.Normal;
-            extModel.MallBaseId = RequestParm.MallBaseId;
-            extModel.TenantId = userInfo?.TenantId ?? 0;
-            extModel.UserId = userInfo?.UserId??0;
-            extModel.CreateTime = DateTime.Now;
-            var flag = consultModule.SetCommerceConsultModule(extModel);
-            return flag ? ApiResult.Success() : ApiResult.Failed();
-        }
-
         /// <summary>
         /// 获取新闻前几条
         /// </summary>
@@ -344,7 +319,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var query = new RB_Commerce_Ask_Extend()
             {
                 CompanyName = parms.GetStringValue("CompanyName"),
-                
             };
             var userInfo = AppletUserInfo;
             query.MallBaseId = RequestParm.MallBaseId;
@@ -355,5 +329,64 @@ namespace Mall.WebApi.Controllers.TradePavilion
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);
         }
+
+        /// <summary>
+        /// 获取当前用户参加的活动
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetUserActivityPage()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_Activity_Extend()
+            {
+            };
+            var userInfo = AppletUserInfo;
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = userInfo?.TenantId ?? 0;
+            query.CreateBy = userInfo.UserId;
+            var list = activityModule.GetUserCommerceActivityPageModule(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 SetCommerceConsult()
+        {
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var extModel = new RB_Commerce_Consult_Extend()
+            {
+                Id = jObj.GetInt("Id"),
+                ActivityId = jObj.GetInt("ActivityId"),
+                UserId = jObj.GetInt("UserId"),
+                LinkMan = jObj.GetStringValue("LinkMan"),
+                LinkTel = jObj.GetStringValue("LinkTel"),
+            };
+            var userInfo = AppletUserInfo;
+            extModel.Status = Common.Enum.DateStateEnum.Normal;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = userInfo?.TenantId ?? 0;
+            extModel.UserId = userInfo?.UserId ?? 0;
+            extModel.CreateTime = DateTime.Now;
+            var flag = consultModule.SetCommerceConsultModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 取消报名
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult CancelCommerceConsult()
+        {
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var ActivityId = jObj.GetInt("ActivityId");
+            var userInfo = AppletUserInfo;
+            var flag = consultModule.CancelCommerceConsultModule(ActivityId, userInfo.UserId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
     }
 }