Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Duty/VisitorReserveModule.cs

@@ -31,6 +31,7 @@ using Edu.Model.Public;
 using Edu.Module.User;
 using Senparc.Weixin.MP.AdvancedAPIs;
 using Edu.Model.ViewModel.Sell;
+using Senparc.CO2NET.Extensions;
 
 namespace Edu.Module.Duty
 {
@@ -221,11 +222,11 @@ namespace Edu.Module.Duty
             message = "";
             bool flag;
 
-            if (visitor_ReserveRepository.ExistsVisitorReserveRepository(model))
-            {
-                message = string.Format("已存在此访客的预约试听课信息,请重新选择!");
-                return false;
-            }
+            //if (visitor_ReserveRepository.ExistsVisitorReserveRepository(model))
+            //{
+            //    message = string.Format("已存在此访客的预约试听课信息,请重新选择!");
+            //    return false;
+            //}
             //获取学员信息
             var guestModel = studentRepository.GetEntity(model.Visitor_Id);
             if (model.Id > 0)
@@ -315,13 +316,16 @@ namespace Edu.Module.Duty
                     if (queryNotifyManager != null && queryNotifyManager.Count > 0)
                     {
                         queryNotifyManager.ForEach(x =>
+                        {
+                            if (!string.IsNullOrWhiteSpace(x.WorkUserId))
                             {
                                 var path = $"/h5page/TrialClass?Id={model.Id}";//这个地址是欠费的通知地址，后续有H5需要改
                                 path = HttpUtility.UrlEncode(path);
-                            string newUrl = $"{Config.ErpUrl}/login?loginId={x.Id}&target={path}";
+                                string newUrl = $"{Config.ErpUrl}/autologin?loginId={x.Id}&target={path}";
                                 Common.Plugin.LogHelper.WriteInfo("试听推送::" + newUrl);
                                 var content = $"<font color='info'>学员试听课通知</font>\n>**概要信息** \n>学员名称：<font color='warning'>{guestModel.StuName}({guestModel.StuRealMobile})</font>\n>预约时间：<font color='warning'>{Common.ConvertHelper.FormatDate(model.ReservationDate)}</font>\n>试听需求：<font color='warning'>{Common.Plugin.StringHelper.FilterHtml(model.Demand)}</font>\n>请 点 击：[查看详情]({newUrl})";
                                 PushWorkChatHelper.PushToWorkChat(content, x.WorkUserId, "学员试听课通知");
+                            }
                         });
                     }
                     #endregion
@@ -382,6 +386,8 @@ namespace Edu.Module.Duty
                             string markdownContent = $@"`留学需求通知` 学员留学需求通知\n>**概要信息** \n>学员名称：{studentModel.StuName}({studentModel.StuRealMobile})\n>
                                                     留学需求：<font color='warning'>{model.Remark}\n>
                                                     请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
+                            if (!string.IsNullOrWhiteSpace(x.WorkUserId))
+                            {
                                 Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
                                 {
                                     CategoryId = PushMessageCategoryEnum.SalePeople,
@@ -394,9 +400,10 @@ namespace Edu.Module.Duty
                                     SendType = 0,
                                     Title = "学员留学需求通知",
                                     Platform = 5,
-                                ReceiveId = x.WorkUserId??""
+                                    ReceiveId = x.WorkUserId ?? ""
                                 };
                                 pushList.Add(modelWork);
+                            }
                         });
                         if (pushList != null && pushList.Any())
                         {
@@ -454,6 +461,8 @@ namespace Edu.Module.Duty
                 if (queryNotifyManager != null && queryNotifyManager.Count > 0)
                 {
                     queryNotifyManager.ForEach(x =>
+                    {
+                        if (!string.IsNullOrWhiteSpace(x.WorkUserId))
                         {
                             Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
                             {
@@ -470,6 +479,7 @@ namespace Edu.Module.Duty
                                 ReceiveId = x.WorkUserId
                             };
                             pushList.Add(modelWork);
+                        }
                     });
                 }
 
@@ -481,6 +491,8 @@ namespace Edu.Module.Duty
                     AccountType = Common.Enum.User.AccountTypeEnum.Teacher
                 });
                 foreach (var item in teacherList)
+                {
+                    if (!string.IsNullOrWhiteSpace(item.WorkUserId))
                     {
                         Common.Message.PushMessageModel pushModels = new Common.Message.PushMessageModel()
                         {
@@ -497,6 +509,8 @@ namespace Edu.Module.Duty
                         };
                         pushList.Add(pushModels);
                     }
+
+                }
                 if (pushList != null && pushList.Any())
                 {
                     new Common.Message.MessageHelper().SendMessage(pushList);
@@ -1065,6 +1079,8 @@ namespace Edu.Module.Duty
                 List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>();
                 #region 老师消息推送
                 if (model.TeacherId != oldTeacherId && oldTeacherId > 0)
+                {
+                    if (!string.IsNullOrWhiteSpace((teacherList.Where(qitem => qitem.AccountId == oldTeacherId)?.FirstOrDefault()?.WorkUserId)))
                     {
                         Common.Message.PushMessageModel pushModel2 = new Common.Message.PushMessageModel()
                         {
@@ -1081,6 +1097,7 @@ namespace Edu.Module.Duty
                         };
                         pushList.Add(pushModel2);
                     }
+                }
                 var path = $"/course/classPlan?ClassType=2";//
                 path = HttpUtility.UrlEncode(path);
                 string markdownContent = $@"`您有新的试听课信息!请查收`\n>**概要信息** \n>学员名称：{guestModel.StuName}({guestModel.StuRealMobile})\n>
@@ -1090,6 +1107,8 @@ namespace Edu.Module.Duty
                                                     课程名称：<font color='warning'>{model.LessonName}\n>
                                                     教室：<font color='warning'>{model.RoomName}\n>
                                                     请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={(teacherList.Where(qitem => qitem.AccountId == model.TeacherId)?.FirstOrDefault()?.Id ?? 0)}&target={path})";
+                if (!string.IsNullOrWhiteSpace((teacherList.Where(qitem => qitem.AccountId == model.TeacherId)?.FirstOrDefault()?.WorkUserId ?? "")))
+                {
                     Common.Message.PushMessageModel pushModel = new Common.Message.PushMessageModel()
                     {
                         CategoryId = PushMessageCategoryEnum.ReserveClass,
@@ -1105,6 +1124,7 @@ namespace Edu.Module.Duty
                         ReceiveId = (teacherList.Where(qitem => qitem.AccountId == model.TeacherId)?.FirstOrDefault()?.WorkUserId ?? "").ToString(),
                     };
                     pushList.Add(pushModel);
+                }
                 #endregion
 
                 #region 销售消息推送
@@ -1123,6 +1143,8 @@ namespace Edu.Module.Duty
                                                     课程名称：<font color='warning'>{model.LessonName}\n>
                                                     教室：<font color='warning'>{model.RoomName}\n>
                                                     请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={modelReserve.CreateBy}&target={paths})";
+                if (!string.IsNullOrWhiteSpace(saleModel.WorkUserId))
+                {
                     Common.Message.PushMessageModel pushModels = new Common.Message.PushMessageModel()
                     {
                         CategoryId = PushMessageCategoryEnum.ReserveClass,
@@ -1138,6 +1160,7 @@ namespace Edu.Module.Duty
                         ReceiveId = (saleModel?.WorkUserId ?? "").ToString(),
                     };
                     pushList.Add(pushModels);
+                }
                 #endregion
 
                 LogHelper.WriteInfo("这是设置老师等发送消息：" + JsonHelper.Serialize(pushList));

Edu.Repository/User/RB_AccountRepository.cs

@@ -439,7 +439,10 @@ FROM
                 {
                     where2.AppendFormat(" AND A.{0} IN({1}) ", nameof(Employee_ViewModel.AccountType), query.AccountTypeStr);
                 }
-
+                if (query.AccountType > 0)
+                {
+                    where2.AppendFormat(" AND A.{0} IN({1}) ", nameof(Employee_ViewModel.AccountType), (int)query.AccountType);
+                }
                 if (!string.IsNullOrEmpty(query.StartEntryTime))
                 {
                     where.AppendFormat(" AND b.{0}>='{1}' ", nameof(Employee_ViewModel.EntryTime), query.StartEntryTime);

Edu.WebApi/appsettings.json

@@ -29,7 +29,7 @@
   "UploadSiteUrl": "http://192.168.5.128:8120",
   "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
   "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
-  "ErpUrl": "http://localhost:8181/#",
+  "ErpUrl": "http://localhost:8181",
   "EducationUrl": "http://localhost:8181/",
   "WorkAPPDomain": "http://m.kookaku.com/pages",
   "Mongo": "mongodb://47.96.23.199:27017",