新增学员状态的推送通知

Edu.Model/ViewModel/Grade/RB_Class_Plan_ViewModel.cs

@@ -164,5 +164,6 @@ namespace Edu.Model.ViewModel.Grade
         /// </summary>
         public int OrderBy { get; set; }
 
+
     }
 }

Edu.Module.Course/OrderModule.cs

@@ -5,6 +5,7 @@ using Edu.Common.API;
 using Edu.Common.Enum;
 using Edu.Common.Enum.Course;
 using Edu.Common.Enum.Sale;
+using Edu.Common.Enum.System;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.Entity.Contract;
@@ -32,6 +33,7 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Web;
 using VT.FW.DB;
 
 namespace Edu.Module.Course
@@ -846,6 +848,41 @@ namespace Edu.Module.Course
                     System.Threading.Tasks.Task.Run(() => UpdateClassInventoryNum(demodel));
                 }
                 #endregion
+
+                #region 推送订单报入日志
+                var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("Push_NewOrder");
+                var param = new RB_Class_ViewModel()
+                {
+                    ClassId = demodel.ClassId
+                };
+                var classDetailModel = classRepository.GetClassAndCourseListRepository(param).FirstOrDefault();
+                if (queryNotifyManager != null && queryNotifyManager.Count > 0)
+                {
+                    queryNotifyManager.ForEach(x =>
+                    {
+                        var path = $"/sale/orderStatistics?OrderId={OrderId}";
+                        path = HttpUtility.UrlEncode(path);
+
+                        string markdownContent = $"<font color='info'>新订单通知</font> 新报入订单推送通知\n>**概要信息** \n>订单编号：{OrderId}\n>关联销售：{userInfo.AccountName}\n>报入班级：{classDetailModel.ClassName}\n>带班老师：{classDetailModel.TeacherName}\n>学习课程：{classDetailModel.CourseName}\n>开班时间：{classDetailModel.OpenTime}\n>订单金额：<font color='warning'>￥{demodel.PreferPrice}({demodel.GuestNum}人)</font>\n>销售备注：<font color='comment'>{demodel.SaleRemark}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
+                        Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
+                        {
+                            CategoryId = PushMessageCategoryEnum.SalePeople,
+                            Content = markdownContent,
+                            CoverImg = "",
+                            CreateByName = "系统",
+                            JumpUrl = "",
+                            WorkMsgType = "markdown",
+                            SendTime = DateTime.Now,
+                            SendType = 0,
+                            Title = "新订单通知",
+                            Platform = 5,
+                            ReceiveId = x.WorkUserId
+                        };
+                        Common.Message.MessageHelper.SendMessage(modelWork);
+                    });
+                }
+
+                #endregion
             }
 
             #region 写日志

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -91,10 +91,11 @@ WHERE 1=1
 SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
        ,Time.StartTime,time.EndTime,time.ClassTimeId
        ,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
-       ,time.TimeHour
+       ,time.TimeHour,c.ClassName
 FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
      LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
      LEFT JOIN rb_class_time AS time ON A.ClassPlanId=Time.ClassPlanId
+    Left JOIN rb_class as c ON c.ClassId=A.ClassId
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);

Edu.Repository/User/RB_AccountRepository.cs

@@ -662,13 +662,11 @@ WHERE e.RB_Group_id ={GroupId} AND e.IsLeave =0 AND o.Score =0 GROUP BY e.Employ
         /// </summary>
         /// <param name="departmentIds"></param>
         /// <returns></returns>
-        public string GetWorkUserIdByDictRepository(string dictKey)
+        public List<RB_Account_ViewModel> GetWorkUserIdByDictRepository(string dictKey)
         {
-            string sql = $"select GROUP_CONCAT(WorkUserId SEPARATOR '|') from rb_account a where EXISTS(select DictKey from rb_dictvalue where DictKey='{dictKey}' and FIND_IN_SET(a.Id,Content)>0)";
+            string sql = $"select Id,WorkUserId from rb_account a where EXISTS(select DictKey from rb_dictvalue where DictKey='{dictKey}' and FIND_IN_SET(a.Id,Content)>0) and WorkUserId is not null";
 
-            var result = ExecuteScalar(sql, null);
-
-            return result != null ? string.Empty : result.ToString();
+            return Get<RB_Account_ViewModel>(sql).ToList();
         }
     }
 }
\ No newline at end of file