页面修改

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -182,5 +182,15 @@ namespace Edu.Model.ViewModel.Course
         /// 销售平台
         /// </summary>
         public string Saleplat { get; set; }
+
+        /// <summary>
+        /// 课程售价
+        /// </summary>
+        public decimal CourseSellPrice { get; set; }
+
+        /// <summary>
+        /// 课程原价
+        /// </summary>
+        public decimal CourseOriginalPrice { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -120,5 +120,10 @@ namespace Edu.Model.ViewModel.Course
         /// 留学就业产品名称
         /// </summary>
         public string StudyName { get; set; }
+
+        /// <summary>
+        /// 协助人员姓名
+        /// </summary>
+        public string HelpEnterName { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_ClassRepository.cs

@@ -235,7 +235,7 @@ WHERE A.ClassId={0}
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,B.CourseName,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName
-       ,IFNULL(t.GuestNum,0) AS OrderStudentCount
+       ,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice 
 FROM rb_class AS A  LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
      LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
      LEFT JOIN rb_class_room AS R ON A.ClassRoomId=R.RoomId

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -34,7 +34,8 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetClassPruductList() {
+        public ApiResult GetClassPruductList()
+        {
             var userInfo = base.UserInfo;
             var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var dmodel = JsonHelper.DeserializeObject<RB_Class_ViewModel>(RequestParm.Msg.ToString());
@@ -56,8 +57,8 @@ namespace Edu.WebApi.Controllers.Course
                 OpenTime = x.OpenTime.ToString("yyyy年MM月dd日"),
                 EndOrderTime = x.EndOrderTime.HasValue ? x.EndOrderTime.Value.ToString("yyyy年MM月dd日") : "",
                 IsCanApply = x.EndOrderTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")) && x.ClassPersion > x.OrderStudentCount ? 1 : 0,
-                x.OriginalPrice,
-                x.SellPrice,
+                OriginalPrice=x.CourseOriginalPrice,
+                SellPrice=x.CourseSellPrice,
                 x.IsStepPrice,
                 x.ClassPersion,
                 x.OutRemark,
@@ -162,6 +163,12 @@ namespace Edu.WebApi.Controllers.Course
                         x.RectorRemark,
                         x.DirectorRemark,
                         x.OfferId,
+                        x.HelpEnterId,
+                        HelpEnterName= UserReidsCache.GetUserLoginInfo(x.HelpEnterId)?.AccountName,
+                        x.GeneralOccupation,
+                        x.EduOccupation,
+                        x.IsLessPrice,
+                        x.LessPrice,
                         SaleRemarkList = x.SaleRemarkList.Select(z => new
                         {
                             z.Id,
@@ -231,6 +238,12 @@ namespace Edu.WebApi.Controllers.Course
                         x.RectorRemark,
                         x.DirectorRemark,
                         x.OfferId,
+                        x.HelpEnterId,
+                        HelpEnterName = UserReidsCache.GetUserLoginInfo(x.HelpEnterId)?.AccountName,
+                        x.GeneralOccupation,
+                        x.EduOccupation,
+                        x.IsLessPrice,
+                        x.LessPrice,
                         SaleRemarkList = x.SaleRemarkList.Select(z => new
                         {
                             z.Id,
@@ -296,6 +309,11 @@ namespace Edu.WebApi.Controllers.Course
                 SaleRemark=base.ParmJObj.GetStringValue("SaleRemark"),
                 SourceId=base.ParmJObj.GetInt("SourceId"),
                 Unit_Price=base.ParmJObj.GetDecimal("Unit_Price"),
+                HelpEnterId=base.ParmJObj.GetInt("HelpEnterId"),
+                GeneralOccupation=base.ParmJObj.GetStringValue("GeneralOccupation"),
+                EduOccupation=base.ParmJObj.GetStringValue("EduOccupation"),
+                IsLessPrice=base.ParmJObj.GetInt("IsLessPrice"),
+                LessPrice=base.ParmJObj.GetDecimal("LessPrice"),
             };
             if (demodel.OrderType== OrderTypeEnum.CourseOrder &&demodel.ClassId <= 0)
             {
@@ -401,6 +419,11 @@ namespace Edu.WebApi.Controllers.Course
                     model.SaleRemark,
                     model.OrderType,
                     model.SourceId,
+                    model.HelpEnterId,
+                    model.GeneralOccupation,
+                    model.EduOccupation,
+                    model.IsLessPrice,
+                    model.LessPrice,
                 },
                 StepPriceList = list.Select(x => new
                 {
@@ -1108,6 +1131,12 @@ namespace Edu.WebApi.Controllers.Course
                     RectorRemark = x?.RectorRemark ?? "",
                     DirectorRemark = x?.DirectorRemark ?? "",
                     x.OfferId,
+                    x.HelpEnterId,
+                    HelpEnterName = UserReidsCache.GetUserLoginInfo(x.HelpEnterId)?.AccountName,
+                    x.GeneralOccupation,
+                    x.EduOccupation,
+                    x.IsLessPrice,
+                    x.LessPrice,
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,