提交代码

Mall.Module.Education/PointModule.cs

@@ -884,7 +884,7 @@ namespace Mall.Module.Education
                 {
                     List<string> openidList = new List<string>();
                     openidList.Add(model.OpenId);
-                    new MiniProgramMsgModule().SendCourseOrderTplMsg(model.TenantId, model.MallBaseId, openidList, model.CourseName, "老师：" + model.TeacherName + "时间：" + model.StudyDate.ToString("HH:mm"), model.StudyDate.ToString("MM月dd日"));
+                    new MiniProgramMsgModule().SendCourseOrderTplMsg(model.TenantId, model.MallBaseId, openidList, model.CourseName,model.RoomInfo, model.StudyDate.ToString("MM月dd日"));
                 }
             }
             pointTeacherCourseOrderRepository.DBSession.Commit();

Mall.Module.User/MiniProgramMsgModule.cs

@@ -944,7 +944,7 @@ namespace Mall.Module.User
                             {
                                 touser = item,
                                 template_id = appletWeChatModel.CourseOrderTpl,
-                                page = "pages/order/index/index",
+                                page = "pages/appointment/personal/studentAppointmentList",
                                 data = new
                                 {
                                     thing1 = new
@@ -953,7 +953,7 @@ namespace Mall.Module.User
                                     },
                                     thing2 = new
                                     {
-                                        value = UserName
+                                        value = UserName.Substring(0, 18)
                                     },
                                     time4 = new
                                     {

Mall.WebApi/Controllers/Education/PointController.cs

@@ -581,7 +581,9 @@ namespace Mall.WebApi.Controllers.Education
             {
                 string DayTime = string.Empty;
                 List<object> planList = new List<object>();
+
                 var nowDayList = oldPointGoodsList.Where(x => x.StudyDate.ToString("yyyy-MM-dd") == startTime.AddDays(i).ToString("yyyy-MM-dd"));
+                int haveCourseCount = nowDayList.Count();
                 foreach (var item in nowDayList)
                 {
                     planList.Add(new
@@ -611,7 +613,8 @@ namespace Mall.WebApi.Controllers.Education
                     DateMonth = startTime.AddDays(i).ToString("MM"),
                     DateDay = startTime.AddDays(i).ToString("dd"),
                     WeekStr = StringHelper.GetWeekChar(startTime.AddDays(i)),
-                    PlanList = planList
+                    PlanList = planList,
+                    HaveCourseCount = haveCourseCount
                 });
             }