页面修改

Mall.Module.Miai/MiaiModule.cs

@@ -276,7 +276,7 @@ namespace Mall.Module.Miai
                 if (commerceList.Any())
                 {
                     string ActivityIds = string.Join(",", commerceList.Select(x => x.SourceId).Distinct());
-                    CommerceList = commerce_ActivityRepository.GetList(new Model.Extend.TradePavilion.RB_Commerce_Activity_Extend() { TenantId = demodel.TenantId, ActivityIds = ActivityIds });
+                    CommerceList = commerce_ActivityRepository.GetCommerceActivityListRepository(new Model.Extend.TradePavilion.RB_Commerce_Activity_Extend() { TenantId = demodel.TenantId, ActivityIds = ActivityIds });
                 }
                 #endregion
                 #region 圈子

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -190,24 +190,24 @@ namespace Mall.Module.TradePavilion
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Commerce_Activity_Extend> GetActivityList(RB_Commerce_Activity_Extend query)
+        public List<RB_Commerce_Activity_Extend> GetCommerceActivityListModule(RB_Commerce_Activity_Extend query)
         {
-            return commerce_ActivityRepository.GetList(query);
+            return commerce_ActivityRepository.GetCommerceActivityListRepository(query);
         }
 
-            #endregion
+        #endregion
 
-            #region 商户活动类型管理
+        #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)
+        /// <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);
         }
@@ -238,7 +238,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Commerce_ActivityType_Extend.CoverImage),model.CoverImage },
                     {nameof(RB_Commerce_ActivityType_Extend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Commerce_ActivityType_Extend.UpdateDate),model.UpdateDate },
-                     {nameof(RB_Commerce_ActivityType_Extend.LableName),model.LableName }
+                    {nameof(RB_Commerce_ActivityType_Extend.LableName),model.LableName }
                 };
                 flag = activityTypeRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_ActivityType_Extend.Id), model.Id));
             }

Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs

@@ -121,12 +121,13 @@ WHERE 1=1
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Commerce_Activity_Extend> GetList(RB_Commerce_Activity_Extend query)
+        public List<RB_Commerce_Activity_Extend> GetCommerceActivityListRepository(RB_Commerce_Activity_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@"SELECT A.*,IFNULL(B.TypeName,'') AS ActivityTypeName
- FROM rb_commerce_activity AS A LEFT JOIN rb_commerce_activitytype AS B ON A.ActivityType=B.Id 
- WHERE 1=1
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.TypeName,'') AS ActivityTypeName
+FROM rb_commerce_activity AS A LEFT JOIN rb_commerce_activitytype AS B ON A.ActivityType=B.Id 
+WHERE 1=1
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.Status), (int)DateStateEnum.Normal);
             if (query == null)

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -103,7 +103,9 @@ namespace Mall.WebApi.Controllers
         /// </summary>
         private static Module.Miai.MiaiModule miaiModule = new Module.Miai.MiaiModule();
 
-
+        /// <summary>
+        /// 商会活动处理类对象
+        /// </summary>
         private static CommerceActivityModule commerceActivityModule = new CommerceActivityModule();
 
         /// <summary>
@@ -111,8 +113,6 @@ namespace Mall.WebApi.Controllers
         /// </summary>
         private static CarrierModule carrierModule = new CarrierModule();
 
-
-
         /// <summary>
         /// 解析插件数据为对象
         /// </summary>
@@ -896,11 +896,9 @@ namespace Mall.WebApi.Controllers
                 //教育模块-老师列表
                 case "educationteacher":
                     var educationTeacherInfo = subItem.data as educationTeacherItem;
-
                     if (educationTeacherInfo != null)
                     {
                         //自定义商品
-
                         if (educationTeacherInfo.TeacherList != null && educationTeacherInfo.TeacherList.Count > 0)
                         {
                             var Ids = "0," + string.Join(",", educationTeacherInfo.TeacherList.Select(qitem => qitem.id));
@@ -1998,10 +1996,37 @@ namespace Mall.WebApi.Controllers
                 //首店活动组件
                 case "tradeActivity":
                     var tradeActivityData = subItem.data as TradeActivityItem;
+                    var activityList = commerceActivityModule.GetCommerceActivityListModule(new RB_Commerce_Activity_Extend()
+                    {
+                        TenantId = TenantId,
+                        ActivityIds = tradeActivityData.ActivityIds
+                    });
+                    List<object> activityDataList = new List<object>();
+                    if (activityList != null && activityList.Count > 0)
+                    {
+                        foreach (var aItem in activityList)
+                        {
+                            var aObj = new
+                            {
+                                aItem.Id,
+                                aItem.ActivityName,
+                                StartTime= Common.ConvertHelper.FormatTime( aItem.StartTime),
+                                EndTime = Common.ConvertHelper.FormatTime(aItem.EndTime),
+                                aItem.CoverImg,
+                                aItem.ActivityType,
+                                aItem.ActivityTypeName,
+                                SignStartTime=Common.ConvertHelper.FormatTime( aItem.SignStartTime),
+                                SignEndTime = Common.ConvertHelper.FormatTime(aItem.SignEndTime),
+                                IsDefault=aItem.Id.ToString().Equals(tradeActivityData.DefaultActivityId),
+                                IsCheck= aItem.Id.ToString().Equals(tradeActivityData.DefaultActivityId),
+                            };
+                            activityDataList.Add(aObj);
+                        }
+                    }
                     obj = new
                     {
                         id = subItem.Id,
-                        data = tradeActivityData
+                        data = activityDataList
                     };
                     break;
             }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -982,7 +982,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 TenantId = userInfo?.TenantId ?? 0
             };
 
-            var list = activityModule.GetActivityList(extModel);
+            var list = activityModule.GetCommerceActivityListModule(extModel);
             return ApiResult.Success("", list);
         }
 
@@ -1002,7 +1002,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 return ApiResult.Failed("请登录");
             }
             Model.Extend.TradePavilion.FirstShopConsult firstShopModel = JsonConvert.DeserializeObject<Model.Extend.TradePavilion.FirstShopConsult>(request.msg.ToString());
-            var activityList = activityModule.GetActivityList(new RB_Commerce_Activity_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, ActivityIds = firstShopModel.ActivityIds });
+            var activityList = activityModule.GetCommerceActivityListModule(new RB_Commerce_Activity_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, ActivityIds = firstShopModel.ActivityIds });
 
             List<RB_Commerce_Consult_Extend> consultList = new List<RB_Commerce_Consult_Extend>();
             foreach (var model in activityList)

Mall.WebApi/Mall.WebApi.csproj.user

@@ -9,7 +9,7 @@
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
     <WebStackScaffolding_LayoutPageFile />
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>E:\Work\Git_Project\Mall_Api\Mall.WebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file