提交代码

Mall.Common/Enum/MarketingCenter/FormTypeEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.MarketingCenter
+{
+    public enum FormTypeEnum
+    {
+        /// <summary>
+        /// 用户信息
+        /// </summary>
+        [EnumField("用户信息")]
+        Base = 1,
+        /// <summary>
+        /// 问卷信息
+        /// </summary>
+        [EnumField("问卷信息")]
+        Survey = 2,
+    }
+}

Mall.Common/Enum/MarketingCenter/SurveyTypeEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.MarketingCenter
+{
+    /// <summary>
+    /// 意见调查类型枚举
+    /// </summary>
+    public enum SurveyTypeEnum
+    {
+        /// <summary>
+        /// 打分
+        /// </summary>
+        [EnumField("打分")]
+        Score = 1,
+        /// <summary>
+        /// 单选
+        /// </summary>
+        [EnumField("单选")]
+        TheRadio = 2,
+        /// <summary>
+        /// 多选
+        /// </summary>
+        [EnumField("多选")]
+        MultiSelect = 3,
+
+
+        /// <summary>
+        /// 文本
+        /// </summary>
+        [EnumField("文本")]
+        TheText = 4,
+    }
+}

Mall.Model/Entity/BaseSetUp/RB_Video_Store.cs

@@ -60,11 +60,11 @@ namespace Mall.Model.Entity.BaseSetUp
 
 
         /// <summary>
-        /// 自定义域名
+        /// 
         /// </summary>
         public string SecretKey { get; set; }
         /// <summary>
-        /// 自定义域名
+        /// 
         /// </summary>
         public string SecretId { get; set; }
        

Mall.Model/Entity/Education/RB_Education_StartUp.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    ///  教育-启动页管理实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_StartUp
+    {
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string PicUrl { get; set; }
+
+
+        /// <summary>
+        /// 音乐地址
+        /// </summary>
+        public string MusicUrl { get; set; }
+
+        /// <summary>
+        /// 是否显示，0-否，1-是
+        /// </summary>
+        public int IsShow { get; set; }
+        /// <summary>
+        /// 秒数
+        /// </summary>
+        public int Seconds { get; set; }
+
+
+
+    }
+}

Mall.Model/Entity/Education/RB_Education_Teacher.cs

@@ -78,5 +78,14 @@ namespace Mall.Model.Entity.Education
         /// </summary>
         public decimal WorkYears { get; set; }
 
+        /// <summary>
+        /// 国籍
+        /// </summary>
+        public string Nationality { get; set; }
+
+        /// <summary>
+        /// 国家图片
+        /// </summary>
+        public string ForeignersUrl { get; set; }
     }
 }

Mall.Model/Entity/MarketingCenter/Rb_GuestSurvey.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 用户意见信息表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_GuestSurvey
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+
+
+       
+
+        /// <summary>
+        /// 会员id
+        /// </summary>
+        public int? UserId { get; set; }
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public DateStateEnum State { get; set; }
+
+
+      
+
+    }
+}

Mall.Model/Entity/MarketingCenter/Rb_GuestSurveyDetails.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 用户意见信息表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_GuestSurveyDetails
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+
+
+        /// <summary>
+        /// 旅客调查id
+        /// </summary>
+        public int? GuestSurveyId { get; set; }
+
+
+        /// <summary>
+        /// 意见id
+        /// </summary>
+        public int? SurveyId { get; set; }
+
+
+        /// <summary>
+        /// 意见选项ids
+        /// </summary>
+        public string SurveyOptionIds { get; set; }
+
+        /// <summary>
+        /// 文本内容
+        /// </summary>
+        public string TextContent { get; set; }
+
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public int ScoreNum { get; set; }
+
+    }
+}

Mall.Model/Entity/MarketingCenter/Rb_Survey.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Common.Enum.MarketingCenter;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 问卷调查基础配置表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Survey
+    {
+
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+        /// <summary>
+        ///意见调查类型
+        /// </summary>
+
+        public SurveyTypeEnum? SurveyType { get; set; }
+
+
+        /// <summary>
+        /// 问卷类型
+        /// </summary>
+        public FormTypeEnum? FormType { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 是否显示（前台）
+        /// </summary>
+        public int IsShow { get; set; }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public DateStateEnum State { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+
+    }
+}

Mall.Model/Entity/MarketingCenter/Rb_SurveyOptions.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+
+    /// <summary>
+    /// 问卷调查基础选项配置表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_SurveyOptions
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+
+
+        /// <summary>
+        /// 调查表id
+        /// </summary>
+        public int SurveyID { get; set; }
+
+
+        /// <summary>
+        /// 选项名称
+        /// </summary>
+
+        public string OptionsName { get; set; }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public DateStateEnum State { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_Teacher_Extend.cs

@@ -46,6 +46,10 @@ namespace Mall.Model.Extend.Education
         public int UserId { get; set; }
 
 
+        /// <summary>
+        /// 模板的时候查询老师信息
+        /// </summary>
+        public string Ids { get; set; }
         /// <summary>
         /// 关联商品
         /// </summary>

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -2463,6 +2463,110 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public List<CustomDetailsItem2> list { get; set; }
     }
+
+
+
+
+    /// <summary>
+    /// 老师
+    /// </summary>
+    public class educationTeacherItem
+    {
+        /// <summary>
+        /// 上边距
+        /// </summary>
+        public string PaddingTop { get; set; }
+
+        /// <summary>
+        /// 下边距
+        /// </summary>
+        public string PaddingBottom { get; set; }
+
+        /// <summary>
+        /// 左边距
+        /// </summary>
+        public string PaddingLeft { get; set; }
+
+        /// <summary>
+        /// 右边距
+        /// </summary>
+        public string PaddingRight { get; set; }
+
+        /// <summary>
+        /// 列表样式[-1-列表模式,0-左右滑动,1-一行一个]
+        /// </summary>
+        public int listStyle { get; set; }
+
+
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
+        public string backgroundColor { get; set; }
+        /// <summary>
+        /// 圆角像素
+        /// </summary>        
+        public int SearchFilletPX
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 老师列表
+        /// </summary>
+        public List<TeacherDetailsItem> TeacherList { get; set; }
+    }
+
+
+
+    /// <summary>
+    /// 老师详情项
+    /// </summary>
+    public class TeacherDetailsItem
+    {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
+        public int id { get; set; }
+
+        /// <summary>
+        /// 老师名称
+        /// </summary>
+
+        public string name { get; set; }
+
+
+        /// <summary>
+        /// 老师国籍
+        /// </summary>
+
+        public string nationality { get; set; }
+
+
+        /// <summary>
+        /// 是否外国人0-否，1-是
+        /// </summary>
+        public string foreignersUrl { get; set; }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+
+        public string lableName { get; set; }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+
+        public List<string> lableNameList { get; set; }
+
+        /// <summary>
+        /// 老师头像
+        /// </summary>
+        public string picUrl { get; set; }
+
+    }
+
     #endregion
 
 

Mall.Model/Extend/MarketingCenter/Rb_GuestSurvey_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    public class Rb_GuestSurvey_Extend: Rb_GuestSurvey
+    {
+        /// <summary>
+        /// 选项详情
+        /// </summary>
+        public List<Rb_SurveyOptions_Extend> GuestSurveyDetailsList { get; set; }
+        /// <summary>
+        /// 会员选项
+        /// </summary>
+        public List<Rb_GuestSurveyDetails> SurveyOptionsList { get; set; }
+
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public decimal ScoreNum { get; set; }
+
+        /// <summary>
+        /// 评分总个数
+        /// </summary>
+        public int ScoreCount { get; set; }
+
+        /// <summary>
+        /// 昵称
+        /// </summary>
+
+        public string NickName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 头像
+        /// </summary>
+
+        public string HeadPic
+        {
+            get;
+            set;
+        }
+
+    }
+}

Mall.Model/Extend/MarketingCenter/Rb_SurveyOptions_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+   public class Rb_SurveyOptions_Extend: Rb_SurveyOptions
+    {
+        /// <summary>
+        /// 单选多选（多选和单选(1)）
+        /// </summary>
+        public string IsCheck { get; set; }
+    }
+}

Mall.Model/Extend/MarketingCenter/Rb_Survey_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    public class Rb_Survey_Extend : Rb_Survey
+    {
+
+        /// <summary>
+        /// 选项
+        /// </summary>
+        public List<Rb_SurveyOptions_Extend> SurveyOptionsList { get; set; }
+
+
+
+        public string SurveyIDs { get; set; }
+
+
+
+
+
+        #region 填写问卷调查的字段
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public int ScoreNum { get; set; }
+
+        /// <summary>
+        /// 文本内容
+        /// </summary>
+        public string TextContent { get; set; }
+
+
+        #endregion
+    }
+}

Mall.Module.Education/EducationModule.cs

@@ -128,6 +128,10 @@ namespace Mall.Module.Education
         /// 课程下载
         /// </summary>
         private readonly RB_Goods_WK_DownLoadRepository goods_WK_DownLoadRepository = new RB_Goods_WK_DownLoadRepository();
+        /// <summary>
+        /// 启动页仓储
+        /// </summary>
+        private readonly RB_Education_StartUpRepository educationStartUpRepository = new RB_Education_StartUpRepository();
 
 
 
@@ -1216,16 +1220,20 @@ namespace Mall.Module.Education
         public object GetMyStudyTime(int day, int userId)
         {
             object MyStudyTimeList = new object();
-            if (day > 0) {
+            if (day > 0)
+            {
                 //倒退查询几天学习时间
                 string EndTime = DateTime.Now.ToString("yyyy-MM-dd");
                 string StartTime = DateTime.Now.AddDays(1 - day).ToString("yyyy-MM-dd");
                 var list = goods_WK_StudyTimeRepository.GetMyStudyTimeByDay(userId, StartTime, EndTime);
 
-                if (list.Count() != day) {
-                    while (Convert.ToDateTime(StartTime) <= Convert.ToDateTime(EndTime)) {
+                if (list.Count() != day)
+                {
+                    while (Convert.ToDateTime(StartTime) <= Convert.ToDateTime(EndTime))
+                    {
                         var model = list.Where(x => x.CreateDate == Convert.ToDateTime(StartTime)).FirstOrDefault();
-                        if (model == null) {
+                        if (model == null)
+                        {
                             list.Add(new RB_Goods_WK_StudyTime_Extend()
                             {
                                 CreateDate = Convert.ToDateTime(StartTime),
@@ -1262,7 +1270,8 @@ namespace Mall.Module.Education
         /// </summary>
         /// <param name="time"></param>
         /// <returns></returns>
-        public object GetTimeConvert(int time,bool IsDay) {
+        public object GetTimeConvert(int time, bool IsDay)
+        {
             decimal minute = Convert.ToDecimal(time) / 60;
             if (minute >= 1)
             {
@@ -1307,7 +1316,8 @@ namespace Mall.Module.Education
                     }
                 }
             }
-            else {
+            else
+            {
                 //return new
                 //{
                 //    Time = Convert.ToDecimal(time),
@@ -1321,7 +1331,8 @@ namespace Mall.Module.Education
                         Unit = "分钟"
                     };
                 }
-                else {
+                else
+                {
                     return new
                     {
                         Time = 0,
@@ -1358,7 +1369,8 @@ namespace Mall.Module.Education
                 };
                 return goods_WK_StudyTimeRepository.Update(keyValues, wheres);
             }
-            else {
+            else
+            {
                 //插入
                 return goods_WK_StudyTimeRepository.Insert(new RB_Goods_WK_StudyTime()
                 {
@@ -1402,7 +1414,8 @@ namespace Mall.Module.Education
             {
                 return true;
             }
-            else {
+            else
+            {
                 //插入记录
                 return goods_WK_CourseStudyRepository.Insert(new RB_Goods_WK_CourseStudy()
                 {
@@ -1426,8 +1439,10 @@ namespace Mall.Module.Education
         public object GetMyRecentStudyPageList(int pageIndex, int pageSize, out long count, int userId)
         {
             var list = goods_WK_StudyTimeRepository.GetMyRecentStudyPageList(pageIndex, pageSize, out count, userId);
-            if (list.Any()) {
-                foreach (var item in list) {
+            if (list.Any())
+            {
+                foreach (var item in list)
+                {
                     if (!string.IsNullOrEmpty(item.CarouselImage) && item.CarouselImage != "[]")
                     {
                         List<string> CarouselList = JsonConvert.DeserializeObject<List<string>>(item.CarouselImage);
@@ -1505,12 +1520,14 @@ namespace Mall.Module.Education
                     }
                     item.WatchNum = 0;//已看完
                     var wmodel = wlist.Where(x => x.GoodsId == item.GoodsId).FirstOrDefault();
-                    if (wmodel != null) {
+                    if (wmodel != null)
+                    {
                         if (wmodel.WNum == 0)
                         {
                             item.WatchNum = -1;//未看
                         }
-                        else {
+                        else
+                        {
                             item.WatchNum = wmodel.TNum - wmodel.WNum;
                         }
                     }
@@ -1592,11 +1609,13 @@ namespace Mall.Module.Education
                 {
                     return ApiResult.Success();
                 }
-                else {
+                else
+                {
                     return ApiResult.Failed();
                 }
             }
-            else {
+            else
+            {
                 if (dmodel.FileState == 3)
                 {
                     //更新  失败的直接重新更新
@@ -1611,11 +1630,13 @@ namespace Mall.Module.Education
                     {
                         return ApiResult.Success();
                     }
-                    else {
+                    else
+                    {
                         return ApiResult.Failed();
                     }
                 }
-                else {
+                else
+                {
                     return ApiResult.Failed("已存在下载，请删除后再试");
                 }
             }
@@ -1658,7 +1679,8 @@ namespace Mall.Module.Education
         public bool DelMyCourseCache(string courseIds, int userId)
         {
             var list = goods_WK_DownLoadRepository.GetList(new RB_Goods_WK_DownLoad_Extend() { CourseIds = courseIds, UserId = userId });
-            foreach (var item in list) {
+            foreach (var item in list)
+            {
                 goods_WK_DownLoadRepository.Delete(item);
             }
             return true;
@@ -1745,6 +1767,8 @@ namespace Mall.Module.Education
                           { nameof(RB_Education_Teacher_Extend.TeacherStatus),model.TeacherStatus},
                           { nameof(RB_Education_Teacher_Extend.Major),model.Major},
                            { nameof(RB_Education_Teacher_Extend.WorkYears),model.WorkYears},
+                           { nameof(RB_Education_Teacher_Extend.Nationality),model.Nationality},
+                           { nameof(RB_Education_Teacher_Extend.ForeignersUrl),model.ForeignersUrl},
                     };
                     List<WhereHelper> wheres = new List<WhereHelper>() {
                         new WhereHelper(){
@@ -3199,5 +3223,42 @@ namespace Mall.Module.Education
             return list;
         }
         #endregion
+
+        #region 启动页管理
+        /// <summary>
+        /// 获取启动页信息
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_StartUp> GetEducationStartUpListRepository(RB_Education_StartUp query)
+        {
+            return educationStartUpRepository.GetListRepository(query);
+        }
+
+        /// <summary>
+        /// 新增/修改小程序启动页
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public bool AddOrUpdateEducationStartUp(RB_Education_StartUp query)
+        {
+            if (query.ID == 0)
+            {
+                return educationStartUpRepository.Insert(query) > 0;
+            }
+            else
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_Education_StartUp.IsShow),query.IsShow},
+                    { nameof(RB_Education_StartUp.PicUrl),query.PicUrl},
+                    { nameof(RB_Education_StartUp.MusicUrl),query.MusicUrl},
+                    { nameof(RB_Education_StartUp.Seconds),query.Seconds},
+                     { nameof(RB_Education_StartUp.UpdateDate),query.UpdateDate},
+                };
+                return educationStartUpRepository.Update(fileds, new WhereHelper(nameof(RB_Education_StartUp.ID), query.ID));
+            }
+        }
+        #endregion
     }
 }

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -513,6 +513,30 @@ namespace Mall.Module.MarketingCenter
                     }
                     item.data = educationArticleModel;
                     break;
+                //教育模块-老师列表
+                case "educationteacher":
+                    educationTeacherItem educationTeacherModel = new educationTeacherItem();
+                    try
+                    {
+                        var driveData = JsonHelper.DeserializeObject<educationTeacherItem>(item.data.ToString());
+                        if (driveData != null)
+                        {
+                            educationTeacherModel.listStyle = driveData?.listStyle ?? 1;
+                            educationTeacherModel.backgroundColor = driveData?.backgroundColor ?? "";
+                            educationTeacherModel.PaddingTop = driveData?.PaddingTop ?? "0";
+                            educationTeacherModel.PaddingBottom = driveData?.PaddingBottom ?? "0";
+                            educationTeacherModel.PaddingLeft = driveData?.PaddingLeft ?? "0";
+                            educationTeacherModel.PaddingRight = driveData?.PaddingRight ?? "0";
+                            educationTeacherModel.SearchFilletPX = driveData?.SearchFilletPX ?? 0;
+                            educationTeacherModel.TeacherList = new List<TeacherDetailsItem>();
+                            educationTeacherModel.TeacherList = driveData.TeacherList;
+                        }
+                    }
+                    catch(Exception ex)
+                    {
+                    }
+                    item.data = educationTeacherModel;
+                    break;
                 //商品插件
                 case "storeGoods": item.data = JsonHelper.DeserializeObject<StoreGoodsItem>(item.data.ToString()); break;
                 case "reservestore":

Mall.Module.User/SupplierModule.cs

@@ -91,7 +91,6 @@ namespace Mall.Module.User
                     if (model.ClientBankAccount.ID == 0)
                     {
                         model.Status = (int)Common.Enum.DateStateEnum.Normal;
-                        model.ClientBankAccount.AccountHolder = model.ClientBankAccount.AccountAlias;
                         var id = clientBankAccountRepository.Insert(model.ClientBankAccount);
                         model.BankAccountId = id;
                         flag = id > 0;
@@ -104,7 +103,7 @@ namespace Mall.Module.User
                             { nameof(RB_ClientBankAccount.ObjID),model.ClientBankAccount.ObjID},
                             { nameof(RB_ClientBankAccount.BankId),model.ClientBankAccount.BankId},
                             { nameof(RB_ClientBankAccount.OpenBankName),model.ClientBankAccount.OpenBankName},
-                            { nameof(RB_ClientBankAccount.AccountHolder),model.ClientBankAccount.AccountAlias},
+                            { nameof(RB_ClientBankAccount.AccountHolder),model.ClientBankAccount.AccountHolder},
                             { nameof(RB_ClientBankAccount.CardNum),model.ClientBankAccount.CardNum},
                             { nameof(RB_ClientBankAccount.AccountAlias),model.ClientBankAccount.AccountAlias},
                             { nameof(RB_ClientBankAccount.Status),model.ClientBankAccount.Status},

Mall.Repository/Education/RB_Education_StartUpRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_StartUpRepository : BaseRepository<RB_Education_StartUp>
+    {
+        /// <summary>
+        /// 获取启动页信息
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_StartUp> GetListRepository(RB_Education_StartUp query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM RB_Education_StartUp WHERE {nameof(RB_Education_StartUp.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_StartUp.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_StartUp.MallBaseId)}={query.MallBaseId}");
+                }
+            }
+            return Get<RB_Education_StartUp>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/MarketingCenter/Rb_GuestSurveyDetailsRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+
+namespace Mall.Repository.MarketingCenter
+{
+   public class Rb_GuestSurveyDetailsRepository:BaseRepository<Rb_GuestSurveyDetails>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_GuestSurveyDetails); } }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_GuestSurveyDetails> GetList(Rb_GuestSurveyDetails where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_GuestSurveyDetails  where 1=1");
+            if (where != null)
+            {
+                if (where.SurveyId > 0)
+                {
+                    sb.AppendFormat(" and SurveyId={0}", where.SurveyId);
+                }
+
+                if (where.GuestSurveyId > 0)
+                {
+                    sb.AppendFormat(" and GuestSurveyId={0}", where.GuestSurveyId);
+                }
+            }
+            return Get<Rb_GuestSurveyDetails>(sb.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="GuestSurveyIds"></param>
+        /// <returns></returns>
+        public List<Rb_GuestSurveyDetails> GetList(string GuestSurveyIds)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_GuestSurveyDetails where 1=1");
+
+            if (!string.IsNullOrWhiteSpace(GuestSurveyIds))
+            {
+                sb.AppendFormat(" and GuestSurveyId in({0})", GuestSurveyIds);
+            }
+            return Get<Rb_GuestSurveyDetails>(sb.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/MarketingCenter/Rb_GuestSurveyRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+
+namespace Mall.Repository.MarketingCenter
+{
+  public  class Rb_GuestSurveyRepository:BaseRepository<Rb_GuestSurvey>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_GuestSurvey); } }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_GuestSurvey_Extend> GetList(Rb_GuestSurvey_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_GuestSurvey  where state=0");
+            if (where != null)
+            {
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and TenantId={0}", where.TenantId);
+                }
+                if (where.UserId > 0)
+                {
+                    sb.AppendFormat(" and UserId={0}", where.UserId);
+                }
+            }
+            return Get<Rb_GuestSurvey_Extend>(sb.ToString()).ToList();
+        }
+
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_GuestSurvey_Extend> GetListInfo(Rb_GuestSurvey_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT a.*,  c.ScoreNum,c.ScoreCount from Rb_GuestSurvey as a 
+LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId) as ScoreCount   from Rb_GuestSurveydetails where ScoreNum>0 GROUP BY GuestSurveyId )  as c ON a.ID=c.GuestSurveyId
+  where a.state=0");
+            if (where != null)
+            {
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and a.MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and a.TenantId={0}", where.TenantId);
+                }
+                if (where.UserId > 0)
+                {
+                    sb.AppendFormat(" and a.UserId={0}", where.UserId);
+                }
+            }
+            return Get<Rb_GuestSurvey_Extend>(sb.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_GuestSurvey_Extend> GetPageList(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_GuestSurvey  where state=0");
+            if (where != null)
+            {
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and a.MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and a.TenantId={0}", where.TenantId);
+                }
+                if (where.UserId > 0)
+                {
+                    sb.AppendFormat(" and a.UserId={0}", where.UserId);
+                }
+            }
+            return GetPage<Rb_GuestSurvey_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
+        }
+
+    }
+}

Mall.Repository/MarketingCenter/Rb_SurveyOptionsRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+
+namespace Mall.Repository.MarketingCenter
+{
+   public class Rb_SurveyOptionsRepository:BaseRepository<Rb_SurveyOptions>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_SurveyOptions); } }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_SurveyOptions_Extend> GetList(Rb_SurveyOptions where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_SurveyOptions  where state=0");
+            if (where != null)
+            {
+                if (where.SurveyID > 0)
+                {
+                    sb.AppendFormat(" and SurveyID={0}", where.SurveyID);
+                }
+            }
+            sb.Append($" ORDER BY {nameof(Rb_SurveyOptions.Sort)} ASC");
+            return Get<Rb_SurveyOptions_Extend>(sb.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="SurveyIDs"></param>
+        /// <returns></returns>
+        public List<Rb_SurveyOptions_Extend> GetList(string SurveyIDs)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_SurveyOptions  where state=0");
+
+            if (!string.IsNullOrWhiteSpace(SurveyIDs))
+            {
+                sb.AppendFormat(" and SurveyID in({0})", SurveyIDs);
+            }
+            sb.Append($" ORDER BY {nameof(Rb_SurveyOptions.Sort)} ASC");
+            return Get<Rb_SurveyOptions_Extend>(sb.ToString()).ToList();
+        }
+
+    }
+}

Mall.Repository/MarketingCenter/Rb_SurveyRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+
+namespace Mall.Repository.MarketingCenter
+{
+    public class Rb_SurveyRepository : BaseRepository<Rb_Survey>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_Survey); } }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Survey_Extend> GetList(Rb_Survey_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_Survey  where state=0");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.IsShow > 0)
+                {
+                    sb.AppendFormat(" and IsShow={0}", where.IsShow);
+                }
+                if (string.IsNullOrWhiteSpace(where.Title))
+                {
+                    sb.AppendFormat(" and Title like'%{0}%'", where.Title);
+                }
+                if (where.SurveyType.HasValue && (int)where.SurveyType > 0)
+                {
+                    sb.AppendFormat(" and SurveyType={0}", (int)where.SurveyType);
+                }
+                if (!string.IsNullOrWhiteSpace(where.SurveyIDs))
+                {
+                    sb.AppendFormat(" and ID in({0})", where.SurveyIDs);
+                }
+            }
+            sb.Append($" ORDER BY {nameof(Rb_Survey.Sort)} ASC");
+            return Get<Rb_Survey_Extend>(sb.ToString()).ToList();
+        }
+
+
+        
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Survey_Extend> GetPageList(int pageIndex, int pageSize, out long rowsCount, Rb_Survey_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_Survey  where state=0");
+            if (where != null)
+            {
+                if (where.IsShow > 0)
+                {
+                    sb.AppendFormat(" and IsShow={0}", where.IsShow);
+                }
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.SurveyType.HasValue && (int)where.SurveyType > 0)
+                {
+                    sb.AppendFormat(" and SurveyType={0}", (int)where.SurveyType);
+                }
+                if (string.IsNullOrWhiteSpace(where.Title))
+                {
+                    sb.AppendFormat(" and Title like'%{0}%'", where.Title);
+                }
+            }
+            sb.Append($" ORDER BY {nameof(Rb_Survey.Sort)} ASC");
+            return GetPage<Rb_Survey_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -20,6 +20,9 @@ using Microsoft.AspNetCore.Authorization;
 using Mall.Module.Education;
 using Mall.Model.Extend.Education;
 using Mall.Model.Entity.Education;
+using Mall.Common.Enum;
+using Mall.Common.Enum.MarketingCenter;
+using Mall.Model.Entity.MarketingCenter;
 
 namespace Mall.WebApi.Controllers.Education
 {
@@ -33,6 +36,7 @@ namespace Mall.WebApi.Controllers.Education
         private Module.User.UserModule UserModule = new Module.User.UserModule();
         private Module.Product.ProductModule productModule = new Module.Product.ProductModule();
         private readonly Module.User.MiniProgramModule programModule = new Module.User.MiniProgramModule();
+        private readonly Module.MarketingCenter.SurveyModule surveyModule = new Module.MarketingCenter.SurveyModule();
         #region 课程卡
 
         /// <summary>
@@ -423,7 +427,8 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetMyStudyTime() {
+        public ApiResult GetMyStudyTime()
+        {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             JObject parms = JObject.Parse(req.msg.ToString());
@@ -437,17 +442,20 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetMyStudyTime() {
+        public ApiResult SetMyStudyTime()
+        {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             JObject parms = JObject.Parse(req.msg.ToString());
             int GoodsId = parms.GetInt("GoodsId", 0);
             int Time = parms.GetInt("Time", 10);//秒
             int CourseId = parms.GetInt("CourseId", 0);//课程id
-            if (GoodsId <= 0) {
+            if (GoodsId <= 0)
+            {
                 return ApiResult.ParamIsNull("请传递课程id");
             }
-            if (Time <= 0) {
+            if (Time <= 0)
+            {
                 return ApiResult.ParamIsNull("时间不能小于等于0");
             }
             bool flag = educationModule.SetMyStudyTime(GoodsId, Time, userInfo.UserId);
@@ -455,7 +463,8 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed();
             }
         }
@@ -496,7 +505,8 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetMyRecentStudyPageList() {
+        public ApiResult GetMyRecentStudyPageList()
+        {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
@@ -529,7 +539,8 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetMyOrderStudyRecordPageList() {
+        public ApiResult GetMyOrderStudyRecordPageList()
+        {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
@@ -545,7 +556,8 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetMyCourseNoCachePageList() {
+        public ApiResult GetMyCourseNoCachePageList()
+        {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
@@ -632,7 +644,8 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetMyCourseCache() {
+        public ApiResult SetMyCourseCache()
+        {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             RB_Goods_WK_DownLoad_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_WK_DownLoad_Extend>(req.msg.ToString());
@@ -640,10 +653,12 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.ParamIsNull("请传递课程id");
             }
-            if (string.IsNullOrEmpty(demodel.FilePath)) {
+            if (string.IsNullOrEmpty(demodel.FilePath))
+            {
                 return ApiResult.ParamIsNull("请传递本地存储路径");
             }
-            if (demodel.FileType <= 0) {
+            if (demodel.FileType <= 0)
+            {
                 return ApiResult.ParamIsNull("请传递文件类型");
             }
 
@@ -656,7 +671,8 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetMyCourseCacheState() {
+        public ApiResult SetMyCourseCacheState()
+        {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             JObject parms = JObject.Parse(req.msg.ToString());
@@ -689,7 +705,8 @@ namespace Mall.WebApi.Controllers.Education
             var userInfo = AppletUserInfo;
             JObject parms = JObject.Parse(req.msg.ToString());
             string CourseIds = parms.GetStringValue("CourseIds");
-            if (string.IsNullOrEmpty(CourseIds)) {
+            if (string.IsNullOrEmpty(CourseIds))
+            {
                 return ApiResult.ParamIsNull();
             }
 
@@ -698,7 +715,8 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed();
             }
         }
@@ -1036,5 +1054,96 @@ namespace Mall.WebApi.Controllers.Education
         #endregion
 
 
+
+        #region 问卷调查
+        /// <summary>
+        /// 新增会员意见调查信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public ApiResult SetGuestSurvey()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            List<Rb_Survey_Extend> modelSurvey = JsonConvert.DeserializeObject<List<Rb_Survey_Extend>>(req.msg.ToString());
+            Rb_GuestSurvey_Extend model = new Rb_GuestSurvey_Extend();
+
+            //先判断是否已添加
+            var GuestSurvey = surveyModule.GetGuestSurveyList(new Rb_GuestSurvey_Extend { UserId = userInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+            if (GuestSurvey.Count > 0)
+            {
+                return ApiResult.Failed("请勿重复参与问卷调查");
+            }
+
+            model.UserId = userInfo.UserId;
+            model.TenantId = userInfo.TenantId;
+            model.MallBaseId = userInfo.MallBaseId;
+            model.CreateDate = System.DateTime.Now;
+            model.ID = 0;
+            model.State = DateStateEnum.Normal;
+            var scoreList = modelSurvey.Where(x => x.SurveyType == SurveyTypeEnum.Score);
+            if (scoreList != null && scoreList.Any())
+            {
+                model.ScoreNum = Convert.ToDecimal(scoreList.Sum(x => x.ScoreNum)) / Convert.ToDecimal(scoreList.Count());
+            }
+            else
+            {
+                model.ScoreNum = 0;
+            }
+            model.SurveyOptionsList = new List<Rb_GuestSurveyDetails>();
+            foreach (var item in modelSurvey)
+            {
+                Rb_GuestSurveyDetails modelSurveyOptions = new Rb_GuestSurveyDetails
+                {
+                    ID = 0,
+                    SurveyId = item.ID,
+                };
+                if (item.SurveyType == SurveyTypeEnum.MultiSelect)
+                {
+                    modelSurveyOptions.ScoreNum = 0;
+                    var surveyDetailsList = item.SurveyOptionsList.Where(x => x.IsCheck == "1");
+                    if (surveyDetailsList == null || !surveyDetailsList.Any())
+                    {
+                        return ApiResult.Failed(item.Title + "您还未选择");
+                    }
+                    modelSurveyOptions.SurveyOptionIds = string.Join(",", surveyDetailsList.Select(x => x.ID));
+
+                }
+                else if (item.SurveyType == SurveyTypeEnum.Score)
+                {
+                    modelSurveyOptions.ScoreNum = item.ScoreNum;
+                }
+                else if (item.SurveyType == SurveyTypeEnum.TheRadio)
+                {
+                    modelSurveyOptions.ScoreNum = 0;
+                    var surveyDetailsList = item.SurveyOptionsList.Where(x => x.IsCheck == "1");
+                    if (surveyDetailsList == null || !surveyDetailsList.Any())
+                    {
+                        return ApiResult.Failed(item.Title + "您还未选择");
+                    }
+                    else if (surveyDetailsList.Count() > 1)
+                    {
+                        return ApiResult.Failed(item.Title + "请勿多选");
+                    }
+                    modelSurveyOptions.SurveyOptionIds = string.Join(",", surveyDetailsList.Select(x => x.ID));
+                }
+                else
+                {
+                    modelSurveyOptions.TextContent = item.TextContent;
+                    modelSurveyOptions.ScoreNum = 0;
+                }
+                model.SurveyOptionsList.Add(modelSurveyOptions);
+            }
+
+            int flag = surveyModule.SetGuestSurvey(model);
+            if (flag > 0)
+            {
+                return ApiResult.Success();
+            }
+
+            else
+                return ApiResult.Failed("问卷调查提交失败");
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Education/AppletSchoolController.cs

@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 using Mall.Common.Plugin;
 using Google.Protobuf.WellKnownTypes;
+using Mall.Model.Entity.Education;
 
 namespace Mall.WebApi.Controllers.Education
 {
@@ -486,5 +487,28 @@ namespace Mall.WebApi.Controllers.Education
 
 
         #endregion
+
+
+        #region 启动页
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetEducationStartUpModel(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            //var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Education_StartUp>(parms.msg.ToString());
+            query.TenantId = parms.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var oldLogisticsModel = educationModule.GetEducationStartUpListRepository(query).FirstOrDefault();
+            if (oldLogisticsModel == null)
+            {
+                oldLogisticsModel = new RB_Education_StartUp();
+            }
+            return ApiResult.Success("", oldLogisticsModel);
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -15,6 +15,7 @@ using Mall.Common.Plugin;
 using Mall.Model.Extend.User;
 using Mall.Model.Extend.Product;
 using Mall.Common.Enum.Goods;
+using Mall.Model.Entity.Education;
 
 namespace Mall.WebApi.Controllers.Education
 {
@@ -723,7 +724,7 @@ namespace Mall.WebApi.Controllers.Education
             RB_Education_Teacher_Extend demodel = JsonConvert.DeserializeObject<RB_Education_Teacher_Extend>(RequestParm.msg.ToString());
             demodel.TenantId = UserInfo.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
-            demodel.TeacherStatus = -1;
+            //demodel.TeacherStatus = -1;
             var list = educationModule.GetTeacherPageListRepository(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -739,7 +740,11 @@ namespace Mall.WebApi.Controllers.Education
                 x.TeacherStatus,
                 x.Telephone,
                 x.Major,
-                x.WorkYears
+                x.WorkYears,
+                x.Nationality,
+                x.ForeignersUrl,
+                x.LableName,
+                LableNameList = string.IsNullOrWhiteSpace(x.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.LableName)
 
             });
             return ApiResult.Success("", pagelist);
@@ -1514,7 +1519,7 @@ namespace Mall.WebApi.Controllers.Education
                 {
                     return ApiResult.Failed("请输入资讯标题");
                 }
-                if (query.LableNameList==null|| !query.LableNameList.Any())
+                if (query.LableNameList == null || !query.LableNameList.Any())
                 {
                     return ApiResult.Failed("请输入标签");
                 }
@@ -1669,5 +1674,70 @@ namespace Mall.WebApi.Controllers.Education
             if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
         }
         #endregion
+
+        #region 启动页管理
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetEducationStartUpModel()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Education_StartUp>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var oldLogisticsModel = educationModule.GetEducationStartUpListRepository(query).FirstOrDefault();
+            if (oldLogisticsModel == null)
+            {
+                oldLogisticsModel = new RB_Education_StartUp();
+            }
+            return ApiResult.Success("", oldLogisticsModel);
+        }
+        /// <summary>
+        /// 保存教师信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult AddOrUpdateEducationStartUp()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Education_StartUp>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入启动页信息");
+            }
+            else
+            {
+                if (query.IsShow == 1)
+                {
+                    if (string.IsNullOrWhiteSpace(query.PicUrl))
+                    {
+                        return ApiResult.Failed("请上传图片");
+                    }
+                    if (query.Seconds == 0)
+                    {
+                        return ApiResult.Failed("秒数必须大于0");
+                    }
+                }
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+                }
+                query.UpdateDate = System.DateTime.Now;
+
+                bool result = educationModule.AddOrUpdateEducationStartUp(query);
+                if (result)
+                {
+                    return ApiResult.Success("启动页信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("启动页信息保存失败");
+                }
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -835,7 +835,53 @@ namespace Mall.WebApi.Controllers
                         data = educationArticleInfo
                     };
                     break;
+                //教育模块-老师列表
+                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));
+                            var tempGoodsList = educationModule.GetTeacherList(new Model.Extend.Education.RB_Education_Teacher_Extend()
+                            {
+                                TenantId = TenantId,
+                                MallBaseId = MallBaseId,
+                                Ids = Ids,
+                                TeacherStatus = 1
+                            });
+                            List<TeacherDetailsItem> newTeacherList = new List<TeacherDetailsItem>();
+                            foreach (var goodItem in educationTeacherInfo.TeacherList)
+                            {
+                                var lastItem = new TeacherDetailsItem();
+                                var tempGood = tempGoodsList?.Where(qitem => qitem.ID == goodItem.id)?.FirstOrDefault();
+                                if (tempGood != null && tempGood.ID > 0)
+                                {
+                                    lastItem.id = tempGood.ID;
+                                    lastItem.name = tempGood.Name;
+                                    lastItem.lableName = tempGood.LableName;
+                                    lastItem.picUrl = tempGood.TeacherLogo;
+                                    lastItem.nationality = tempGood.Nationality;
+                                    lastItem.foreignersUrl = tempGood.ForeignersUrl;
+                                    if (!string.IsNullOrWhiteSpace(lastItem.lableName))
+                                    {
+                                        lastItem.lableNameList = JsonConvert.DeserializeObject<List<string>>(lastItem.lableName);
+                                    }
+                                    newTeacherList.Add(lastItem);
+                                }
+                            }
+                            educationTeacherInfo.TeacherList = newTeacherList;
+                        }
+                    }
+                    obj = new
+                    {
+                        id = subItem.Id,
+                        data = educationTeacherInfo
+                    };
+                    break;
                 //商品插件
                 case "storeGoods":
                     var storeGoodsData = subItem.data as StoreGoodsItem;
@@ -2472,7 +2518,7 @@ namespace Mall.WebApi.Controllers
                 theme_color = "",
                 latitude_longitude = mallBaseModel?.LongAndLat,
                 IsShowRecharge = rechargeModel.IsOpenBtn,
-                IsOpenReserve=(miniProgram?.IsOpenReserve??0),
+                IsOpenReserve = (miniProgram?.IsOpenReserve ?? 0),
             };
             #endregion
             return setting;

Mall.WebApi/Controllers/MarketingCenter/AppletSurveyController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Mall.Module.MarketingCenter;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Mall.WebApi.Controllers.MarketingCenter
+{
+    public class AppletSurveyController : Controller
+    {
+        /// <summary>
+        /// 处理类对象
+        /// </summary>
+        private SurveyModule module = new SurveyModule();
+
+
+    }
+}

Mall.WebApi/Controllers/MarketingCenter/SurveyController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Mall.Module.MarketingCenter;
+using Mall.Common.API;
+using Newtonsoft.Json;
+using Mall.Model.Extend.MarketingCenter;
+using Mall.Common.Plugin;
+using Newtonsoft.Json.Linq;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Common.Enum.MarketingCenter;
+
+namespace Mall.WebApi.Controllers.MarketingCenter
+{
+
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class SurveyController : BaseController
+    {
+        /// <summary>
+        /// 处理类对象
+        /// </summary>
+        private SurveyModule module = new SurveyModule();
+
+
+
+        #region 问卷调查
+        /// <summary>
+        /// 获取基础信息列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            Rb_Survey_Extend demodel = JsonConvert.DeserializeObject<Rb_Survey_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var data = module.GetPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            var list = data.Select(x => new { x.ID, x.SurveyType, x.Title, x.IsShow, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType) }).ToList();
+            pagelist.count = int.Parse(count.ToString());
+            pagelist.pageData = list;
+            return ApiResult.Success("", pagelist);
+        }
+
+
+        /// <summary>
+        /// 通过id获取信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSurvey()
+        {
+            var parms = RequestParm;
+            JObject parm = JObject.Parse(parms.msg.ToString());
+            int SurveyID = parm.GetInt("SurveyID");
+            Rb_Survey_Extend model = module.GetEntity(SurveyID).RefMapperTo<Rb_Survey_Extend>();
+            if (model != null)
+            {
+                model.SurveyOptionsList = new List<Rb_SurveyOptions_Extend>();
+
+                model.SurveyOptionsList = module.GetSurveyOptionsList(new Rb_SurveyOptions { SurveyID = model.ID });
+
+                return ApiResult.Success("请求成功！", model);
+            }
+            return ApiResult.Failed("未找到此调查信息！");
+        }
+
+        /// <summary>
+        /// 通过id获取信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelSurvey()
+        {
+            var parms = RequestParm;
+            JObject parm = JObject.Parse(parms.msg.ToString());
+            int SurveyID = parm.GetInt("SurveyID");
+            Rb_Survey_Extend model = module.GetEntity(SurveyID).RefMapperTo<Rb_Survey_Extend>();
+            if (model != null)
+            {
+                if (model.State == Common.Enum.DateStateEnum.Delete)
+                {
+                    return ApiResult.Failed("已删除请勿重复删除！");
+                }
+                model.SurveyOptionsList = new List<Rb_SurveyOptions_Extend>();
+
+                model.SurveyOptionsList = module.GetSurveyOptionsList(new Rb_SurveyOptions { SurveyID = model.ID });
+
+                bool result = module.DelSurvey(model);
+                return ApiResult.Success("删除成功！");
+            }
+            return ApiResult.Failed("未找到此调查信息！");
+        }
+
+        /// <summary>
+        /// 添加修改调查信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetSurvey()
+        {
+            var parms = RequestParm;
+            Rb_Survey_Extend model = JsonConvert.DeserializeObject<Rb_Survey_Extend>(parms.msg.ToString());
+            if (string.IsNullOrEmpty(model.Title))
+            {
+                return ApiResult.Failed("请填写名称！");
+            }
+            if (model.SurveyType == SurveyTypeEnum.MultiSelect || model.SurveyType == SurveyTypeEnum.TheRadio)
+            {
+                if (model.SurveyOptionsList == null || !model.SurveyOptionsList.Any())
+                {
+                    return ApiResult.Failed("请填写选项！");
+                }
+                else
+                {
+                    model.SurveyOptionsList.ForEach(x => x.State = Common.Enum.DateStateEnum.Normal);
+                }
+            }
+            if (model.ID == 0)
+            {
+                model.TenantId = UserInfo.TenantId;
+                model.MallBaseId = parms.MallBaseId;
+                model.CreateDate = DateTime.Now;
+            }
+            model.UpdateDate = DateTime.Now;
+            model.State = Common.Enum.DateStateEnum.Normal;
+            bool flag = module.SetSurvey(model);
+            if (flag)
+                return ApiResult.Success();
+            else
+                return ApiResult.Failed("请求失败！");
+        }
+
+        /// <summary>
+        /// 获取调查选项类型枚举列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSurveyTypeEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(SurveyTypeEnum));
+            return ApiResult.Success("", list.Select(x => new { Id = x.Value, Name = x.Key }));
+        }
+
+
+        /// <summary>
+        /// 获取调查类型枚举列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetFormTypeEnumEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(FormTypeEnum));
+            return ApiResult.Success("", list.Select(x => new { Id = x.Value, Name = x.Key }));
+        }
+        #endregion
+
+
+    }
+}

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -206,6 +206,10 @@ namespace Mall.WebApi.Controllers.User
             query.TenantId = UserInfo.TenantId;
             query.MallBaseId = parms.MallBaseId;
             query.AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited;
+            if (string.IsNullOrWhiteSpace(query.Name))
+            {
+                return ApiResult.Success("", new List<RB_Distributor_Info_Extend>());
+            }
             var oldLogisticsList = orderModule.GetDistributorInfoList(query);
             if (oldLogisticsList != null && oldLogisticsList.Any())
             {