提交代码

Mall.Model/Entity/Education/RB_Education_ActivityPlan.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Education
+{
+
+    /// <summary>
+    /// 活动行程
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_ActivityPlan
+    {
+        /// <summary>
+        /// 活动行程id(主键)
+        /// </summary>
+        public int Id { get; set; }
+
+
+        /// <summary>
+        /// 活动id
+        /// </summary>
+        public int ActivityId { get; set; }
+
+
+        /// <summary>
+        /// 大标题id
+        /// </summary>
+        public int TitleId { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int TripSort { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+
+        /// <summary>
+        /// 活动时长
+        /// </summary>
+        public int ActivityDuration { get; set; }
+
+
+        /// <summary>
+        /// 经纬度（逗号分隔）
+        /// </summary>
+        public string LonLat { get; set; }
+
+        /// <summary>
+        /// 位置名称
+        /// </summary>
+        public string LocationName { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string TripTitle { get; set; }
+
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string TripContent { get; set; }
+
+
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string TripPic { get; set; }
+
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public Common.Enum.DateStateEnum Status { get; set; }
+
+    }
+}

Mall.Model/Entity/Education/RB_Education_ActivityTitle.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Education
+{
+
+    /// <summary>
+    /// 活动大标题实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_ActivityTitle
+    {
+        /// <summary>
+        /// 活动行程id(主键)
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 活动id
+        /// </summary>
+        public int ActivityId { get; set; }
+
+        /// <summary>
+        /// 大标题
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int TripSort { get; set; }
+
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public Common.Enum.DateStateEnum Status { get; set; }
+
+    }
+}

Mall.Model/Extend/Education/RB_Education_ActivityPlan_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+    public class RB_Education_ActivityPlan_Extend : RB_Education_ActivityPlan
+    {
+        /// <summary>
+        /// 大标题ids
+        /// </summary>
+        public string TitleIds { get; set; }
+
+        /// <summary>
+        /// 活动安排图片
+        /// </summary>
+        public List<string> TripPicList { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_ActivityTitle_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+    public class RB_Education_ActivityTitle_Extend : RB_Education_ActivityTitle
+    {
+        /// <summary>
+        /// 活动安排
+        /// </summary>
+        public List<RB_Education_ActivityPlan_Extend> ActivityPlanList { get; set; }
+
+
+        /// <summary>
+        /// 活动ids
+        /// </summary>
+        public string ActivityIds { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_Activity_Extend.cs

@@ -181,9 +181,15 @@ namespace Mall.Model.Extend.Education
         public string OrderByStr { get; set; }
 
         /// <summary>
-        /// 0-即将开始，1-已结束
+        /// 0-（小程序是即将开始，后台是未开始），1-已结束,1-进行中
         /// </summary>
         public int SelectIsEnd { get; set; }
         #endregion
+
+
+        /// <summary>
+        /// 活动安排  2021-06-25 Add By:W
+        /// </summary>
+        public List<RB_Education_ActivityTitle_Extend> ActivityTitleList { get; set; }
     }
 }

Mall.Repository/Education/RB_Education_ActivityPlanRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_ActivityPlanRepository : BaseRepository<RB_Education_ActivityPlan>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Education_ActivityPlan_Extend> GetActivityPlanList(RB_Education_ActivityPlan_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* FROM RB_Education_ActivityPlan AS A 
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityPlan_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_ActivityPlan_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityPlan_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityPlan_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.ActivityId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityPlan_Extend.ActivityId), query.ActivityId);
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.TitleIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Education_ActivityPlan_Extend.TitleId), query.TitleIds);
+                }
+            }
+            return Get<RB_Education_ActivityPlan_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_ActivityTitleRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_ActivityTitleRepository : BaseRepository<RB_Education_ActivityTitle>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Education_ActivityTitle_Extend> GetActivityTitleList(RB_Education_ActivityTitle_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* FROM RB_Education_ActivityTitle AS A 
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityTitle_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_ActivityTitle_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityTitle_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityTitle_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.ActivityId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityTitle_Extend.ActivityId), query.ActivityId);
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.ActivityIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Education_ActivityTitle_Extend.ActivityId), query.ActivityIds);
+                }
+            }
+            return Get<RB_Education_ActivityTitle_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -1890,11 +1890,21 @@ namespace Mall.WebApi.Controllers.Education
                         groupList = fileObjectList
                     });
                 }
-                //foreach (var item in fileList.GroupBy(x => x.Type))
-                //{
-
-                //}
-
+                model.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
+                model.ActivityTitleList = activityModule.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
+                if (model.ActivityTitleList != null && model.ActivityTitleList.Any())
+                {
+                    var planList = activityModule.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
+                    if (planList!=null&& planList.Any())
+                    {
+                        planList.ForEach(x => x.TripPicList = !string.IsNullOrWhiteSpace(x.TripPic) ? JsonConvert.DeserializeObject<List<string>>(x.TripPic) : new List<string>());
+                        foreach (var item in model.ActivityTitleList)
+                        {
+                            item.ActivityPlanList = new List<RB_Education_ActivityPlan_Extend>();
+                            item.ActivityPlanList = planList.Where(x => x.TitleId == item.Id).ToList();
+                        }
+                    }
+                }
                 var data = new
                 {
                     model.ActivityName,
@@ -1912,7 +1922,7 @@ namespace Mall.WebApi.Controllers.Education
                     model.IsFree,
                     BMStart = model.SignStartTime.HasValue ? model.SignStartTime.Value.ToString("MM/dd HH:mm") : "",
                     BMEnd = model.SignEndTime.HasValue ? model.SignEndTime.Value.ToString("MM/dd HH:mm") : "",
-                    HDStart = model.StartTime.ToString("HH:mm"),
+                    HDStart = model.StartTime.ToString("MM/dd HH:mm"),
                     HDEnd = model.EndTime.ToString("MM/dd HH:mm"),
                     model.Id,
                     model.ActivityStatus,
@@ -1927,7 +1937,8 @@ namespace Mall.WebApi.Controllers.Education
                     model.StartAge,
                     IsJoinActivity = (model.EducationConsultList.Where(x => x.UserId == userInfo.UserId) != null && model.EducationConsultList.Where(x => x.UserId == userInfo.UserId).Any()) ? 1 : 0,
                     model.Summary,
-                    FileGroup = fileGroup
+                    FileGroup = fileGroup,
+                    ActivityTitleList = (model.ActivityTitleList != null && model.ActivityTitleList.Any()) ? model.ActivityTitleList : new List<RB_Education_ActivityTitle_Extend>()
                 };
                 return ApiResult.Success(data: data);
             }

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -2124,6 +2124,33 @@ namespace Mall.WebApi.Controllers.Education
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+
+        /// <summary>
+        /// 新增修改商会活动
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSetActivityPlan()
+        {
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var extModel = new RB_Education_Activity_Extend()
+            {
+                Id = jObj.GetInt("Id"),
+            };
+            try
+            {
+                extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
+            }
+            catch (Exception ex)
+            {
+                extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
+            }
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            var flag = activityModule.SetActivityPlanModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 获取商会活动详情
         /// </summary>
@@ -2135,25 +2162,25 @@ namespace Mall.WebApi.Controllers.Education
             var Id = parms.GetInt("Id", 0);
             var extModel = activityModule.GetActivityModule(Id);
 
-            //if (extModel != null && extModel.Id > 0)
-            //{
-            //    extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
-            //    extModel.ActivityTitleList = activityModule.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
-            //    if (extModel.ActivityTitleList != null && extModel.ActivityTitleList.Any())
-            //    {
-            //        var planList = activityModule.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
-            //        if (planList != null && planList.Any())
-            //        {
-            //            planList.ForEach(x => x.TripPicList = !string.IsNullOrWhiteSpace(x.TripPic) ? JsonConvert.DeserializeObject<List<string>>(x.TripPic) : new List<string>());
-            //            foreach (var item in extModel.ActivityTitleList)
-            //            {
-            //                item.ActivityPlanList = new List<RB_Education_ActivityPlan_Extend>();
-            //                item.ActivityPlanList = planList.Where(x => x.TitleId == item.Id).ToList();
-            //            }
-            //        }
-
-            //    }
-            //}
+            if (extModel != null && extModel.Id > 0)
+            {
+                extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
+                extModel.ActivityTitleList = activityModule.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
+                if (extModel.ActivityTitleList != null && extModel.ActivityTitleList.Any())
+                {
+                    var planList = activityModule.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
+                    if (planList != null && planList.Any())
+                    {
+                        planList.ForEach(x => x.TripPicList = !string.IsNullOrWhiteSpace(x.TripPic) ? JsonConvert.DeserializeObject<List<string>>(x.TripPic) : new List<string>());
+                        foreach (var item in extModel.ActivityTitleList)
+                        {
+                            item.ActivityPlanList = new List<RB_Education_ActivityPlan_Extend>();
+                            item.ActivityPlanList = planList.Where(x => x.TitleId == item.Id).ToList();
+                        }
+                    }
+
+                }
+            }
             return ApiResult.Success(data: extModel);
         }
 

Mall.WindowsService/Mall.WindowsService.csproj.user

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>D:\project\GitProject\Shopping\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>D:\project\GitProject\Mall\oldMall\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="WindowsService.cs">