新增小程序接口

Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs

@@ -31,5 +31,50 @@ namespace Mall.Model.Extend.TradePavilion
         /// 商会活动详情列表
         /// </summary>
         public List<RB_Commerce_Details_Extend> CommerceDetailsList { get; set; }
+
+        /// <summary>
+        /// 活动状态
+        /// </summary>
+        public int ActivityStatus
+        {
+            get
+            {
+                int status = 0;//未开始
+                DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now));
+                if (currentDay >= this.StartTime && currentDay <= this.EndTime)
+                {
+                    status = 1;//进行中
+                }
+                else if (currentDay > this.EndTime)
+                {
+                    status = 2;//已结束
+                }
+                return status;
+            }
+        }
+
+        /// <summary>
+        /// 活动状态字符串
+        /// </summary>
+        public string ActivityStatusStr
+        {
+            get
+            {
+                string str = "未开始";
+                switch (this.ActivityStatus)
+                {
+                    case 0:
+                        str = "未开始";
+                        break;
+                    case 1:
+                        str = "进行中";
+                        break;
+                    case 2:
+                        str = "已结束";
+                        break;
+                }
+                return str;
+            }
+        }
     }
 }

Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs

@@ -52,6 +52,10 @@ WHERE 1=1
                     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);
+                }
             }
             return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Mall.Repository/TradePavilion/RB_InvestmentProcurementRepository.cs

@@ -48,6 +48,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_InvestmentProcurement_Extend.MallBaseId), query.MallBaseId);
                 }
+                if (query.Type > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_InvestmentProcurement_Extend.Type), query.Type);
+                }
                 if (!string.IsNullOrEmpty(query.CompanyName))
                 {
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Company_Extend.CompanyName));

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Mall.WebApi.Controllers.TradePavilion
@@ -101,5 +102,55 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var model = companyModule.GetCompanyByUserIdModule(userInfo.UserId);
             return ApiResult.Success(data: model);
         }
+
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceActivityTypeList()
+        {
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_ActivityType_Extend()
+            {
+                TypeName = jObj.GetStringValue("TypeName")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = activityModule.GetCommerceActivityTypeListModule(query);
+            return ApiResult.Success(data: list.Select(qitem=>new { qitem.Id,qitem.CoverImage,qitem.TypeName}));
+        }
+
+        /// <summary>
+        /// 获取商会活动分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceActivityPage()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_Activity_Extend()
+            {
+                 ActivityType= jObj.GetInt("ActivityType")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = activityModule.GetCommerceActivityPageListModule(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 GetCommerceActivity()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var extModel = activityModule.GetCommerceActivityModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
     }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -184,7 +184,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_InvestmentProcurement_Extend()
             {
-                CompanyName = parms.GetStringValue("CompanyName")
+                CompanyName = parms.GetStringValue("CompanyName"),
+                Type=parms.GetInt("Type"),
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;