页面修改

Edu.Common/Enum/System/PushMessageCategoryEnum.cs

@@ -45,5 +45,11 @@ namespace Edu.Common.Enum.System
         /// </summary>
         [EnumField("财务单据审核")]
         Finance = 6,
+
+        /// <summary>
+        /// 试听课
+        /// </summary>
+        [EnumField("试听课")]
+        ReserveClass = 7,
     }
 }

Edu.Model/ViewModel/User/RB_Account_ViewModel.cs

@@ -18,6 +18,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public string QIds { get; set; }
 
+        /// <summary>
+        /// 子项表编号
+        /// </summary>
+        public string QAccountIds { get; set; }
+
         /// <summary>
         /// 集团名称
         /// </summary>

Edu.Module.Course/OrderModule2.cs

@@ -116,7 +116,11 @@ namespace Edu.Module.Course
             //课时单价
             var classHourPrice = Math.Round(orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours, 2);
             //预计退款金额
-            var backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
+            decimal backMoney =0;
+            //backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
+            //违约金
+            decimal breakContractPrice = (classModel.ClassHours - FinishHours) * classHourPrice * Convert.ToDecimal(0.1);
+            backMoney = (orderModel.Income + orderModel.PlatformTax) - FinishHours * classHourPrice - breakContractPrice;
 
             var backClassModel = new RB_Student_BackClass_ViewModel()
             {

Edu.Module.Duty/Edu.Module.Duty.csproj

@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Edu.Cache\Edu.Cache.csproj" />
     <ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
     <ProjectReference Include="..\Edu.Repository\Edu.Repository.csproj" />
   </ItemGroup>

Edu.Module.Duty/VisitorReserveModule.cs

@@ -8,6 +8,11 @@ using VT.FW.AOP.CustomerAttribute;
 using VT.FW.DB;
 using System.Linq;
 using Edu.Repository.Course;
+using Edu.Common.Enum.System;
+using Edu.Cache.User;
+using Edu.Model.CacheModel;
+using Edu.Repository.User;
+using Edu.Common.Message;
 
 namespace Edu.Module.Duty
 {
@@ -31,7 +36,12 @@ namespace Edu.Module.Duty
         /// </summary>
         private readonly RB_Class_PlanRepository class_PlanRepository = new RB_Class_PlanRepository();
 
-        
+        /// <summary>
+        /// 账号管理仓储层对象
+        /// </summary>
+        private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
+
+
 
         /// <summary>
         /// 获取访客约课分页列表
@@ -210,6 +220,7 @@ namespace Edu.Module.Duty
         {
             bool flag;
             message = "";
+            var UserInfo = UserReidsCache.GetUserLoginInfo(model.CreateBy);
             var chooseDateTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(model.ClassDate) + " " + model.ClassTime);
             var chooseEndTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(model.ClassDate) + " " + model.EndTime);
             #region 教师验证
@@ -229,6 +240,7 @@ namespace Edu.Module.Duty
             #endregion
             if (model.ReserveClassId > 0)
             {
+                var oldModel = GetReserveClassModule(model.ReserveClassId);
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Reserve_Class_Extend.TeacherId),model.TeacherId  },
@@ -241,12 +253,74 @@ namespace Edu.Module.Duty
                     {nameof(RB_Reserve_Class_Extend.UpdateTime),model.UpdateTime  },
                 };
                 flag = reserve_ClassRepository.Update(fileds, new WhereHelper(nameof(RB_Reserve_Class_Extend.ReserveClassId), model.ReserveClassId));
+                if (flag && model.TeacherId != oldModel.TeacherId)
+                {
+                    var teacherList = accountRepository.GetAccountListRepository(new Model.ViewModel.User.RB_Account_ViewModel()
+                    {
+                        Group_Id = model.Group_Id,
+                        QAccountIds = (model?.TeacherId??0) +","+(oldModel?.TeacherId??0),
+                        AccountType= Common.Enum.User.AccountTypeEnum.Teacher
+                    });
+                    Common.Message.PushMessageModel pushModel = new Common.Message.PushMessageModel()
+                    {
+                        CategoryId = PushMessageCategoryEnum.ReserveClass,
+                        Content = "您有新的试听课信息!请查收",
+                        CoverImg = "",
+                        CreateByName = UserInfo.AccountName,
+                        JumpUrl = $"/course/classPlan?ClassType=2",
+                        SendTime = DateTime.Now,
+                        SendType = 0,
+                        Title = "试听课",
+                        Platform = 2,
+                        ReceiveId = (teacherList.Where(qitem=>qitem.AccountId==model.TeacherId)?.FirstOrDefault()?.Id??0).ToString(),
+                    };
+                    Common.Message.PushMessageModel pushModel2 = new Common.Message.PushMessageModel()
+                    {
+                        CategoryId = PushMessageCategoryEnum.ReserveClass,
+                        Content = "您有试听课被取消!请查收",
+                        CoverImg = "",
+                        CreateByName = UserInfo.AccountName,
+                        JumpUrl = $"/course/classPlan?ClassType=2",
+                        SendTime = DateTime.Now,
+                        SendType = 0,
+                        Title = "试听课",
+                        Platform = 2,
+                        ReceiveId = (teacherList.Where(qitem => qitem.AccountId == oldModel.TeacherId)?.FirstOrDefault()?.Id ?? 0).ToString(),
+                    };
+                    List<PushMessageModel> messageList = new List<PushMessageModel>();
+                    messageList.Add(pushModel);
+                    messageList.Add(pushModel2);
+                    Common.Message.MessageHelper.SendMessage(messageList);
+                }
             }
             else
             {
                 var newId = reserve_ClassRepository.Insert(model);
                 model.ReserveClassId = newId;
                 flag = newId > 0;
+                var teacherModel = accountRepository.GetAccountListRepository(new Model.ViewModel.User.RB_Account_ViewModel()
+                {
+                    Group_Id = model.Group_Id,
+                    AccountId = model.TeacherId,
+                    AccountType = Common.Enum.User.AccountTypeEnum.Teacher
+                })?.FirstOrDefault();
+                Common.Message.PushMessageModel pushModel = new Common.Message.PushMessageModel()
+                {
+                    CategoryId = PushMessageCategoryEnum.ReserveClass,
+                    Content = "您有新的试听课信息!请查收",
+                    CoverImg = "",
+                    CreateByName = UserInfo.AccountName,
+                    JumpUrl = $"/course/classPlan?ClassType=2",
+                    SendTime = DateTime.Now,
+                    SendType = 0,
+                    Title = "试听课",
+                    Platform = 2,
+                    ReceiveId = (teacherModel?.Id ?? 0).ToString(),
+                };
+                if (flag)
+                {
+                    Common.Message.MessageHelper.SendMessage(pushModel);
+                }
             }
             return flag;
         }
@@ -281,7 +355,6 @@ namespace Edu.Module.Duty
                     }
                 }
             }
-
             var checkModel = new RB_Reserve_Class_Extend()
             {
                 ClassDate = model.ClassDate,
@@ -373,7 +446,7 @@ namespace Edu.Module.Duty
         /// <param name="ReserveClassId"></param>
         /// <param name="message"></param>
         /// <returns></returns>
-        public bool RemoveReserveClassModule(int ReserveClassId, out string message)
+        public bool RemoveReserveClassModule(int ReserveClassId, UserInfo UserInfo, out string message)
         {
             message = "";
             var visitorReserve = visitor_ReserveRepository.GetVisitorReserveStaticsListRepository(new RB_Visitor_Reserve_Extend()
@@ -390,6 +463,30 @@ namespace Edu.Module.Duty
                 {nameof(RB_Visitor_Reserve_Extend.Status),(int)DateStateEnum.Delete  },
             };
             var flag = reserve_ClassRepository.Update(fileds, new WhereHelper(nameof(RB_Reserve_Class_Extend.ReserveClassId), ReserveClassId));
+            var model = GetReserveClassModule(ReserveClassId);
+            var teacherModel = accountRepository.GetAccountListRepository(new Model.ViewModel.User.RB_Account_ViewModel()
+            {
+                Group_Id = model.Group_Id,
+                AccountId = model.TeacherId,
+                AccountType= Common.Enum.User.AccountTypeEnum.Teacher
+            })?.FirstOrDefault();
+            Common.Message.PushMessageModel pushModel = new Common.Message.PushMessageModel()
+            {
+                CategoryId = PushMessageCategoryEnum.ReserveClass,
+                Content = "您有试听课信息被取消!请查收",
+                CoverImg = "",
+                CreateByName = UserInfo.AccountName,
+                JumpUrl = $"/course/classPlan?ClassType=2",
+                SendTime = DateTime.Now,
+                SendType = 0,
+                Title = "试听课",
+                Platform = 2,
+                ReceiveId = (teacherModel?.Id??0).ToString(),
+            };
+            if (flag)
+            {
+                Common.Message.MessageHelper.SendMessage(pushModel);
+            }
             return flag;
         }
     }

Edu.Repository/User/RB_AccountRepository.cs

@@ -56,6 +56,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Account_ViewModel.AccountId), query.AccountId);
                 }
+                if (!string.IsNullOrEmpty(query.QAccountIds))
+                {
+                    builder.AppendFormat(" AND a.{0} IN({1}) ", nameof(RB_Account_ViewModel.AccountId), query.QAccountIds);
+                }
             }
             return Get<RB_Account_ViewModel>(builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/Duty/VisitorReserveController.cs

@@ -260,7 +260,7 @@ namespace Edu.WebApi.Controllers.Duty
         public ApiResult RemoveReserveClass()
         {
             var ReserveClassId = base.ParmJObj.GetInt("ReserveClassId", 0);
-            var flag = visitorReserveModule.RemoveReserveClassModule(ReserveClassId,out string message);
+            var flag = visitorReserveModule.RemoveReserveClassModule(ReserveClassId,base.UserInfo,out string message);
             return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }
         #endregion