页面修改

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -105,5 +105,43 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int IsChaBan { get; set; }
 
+        /// <summary>
+        /// 生效时间
+        /// </summary>
+        public DateTime EffectTime { get; set; }
+
+        /// <summary>
+        /// 生效状态(0-未生效，1-生效中，2-完成)
+        /// </summary>
+        public int EffectStatus { get; set; }
+
+        /// <summary>
+        /// 生效状态字符串
+        /// </summary>
+        public string EffectStatusStr
+        {
+            get
+            {
+                string str = "";
+                if (this.EffectStatus == 0)
+                {
+                    str = "未生效";
+                }
+                else if (this.EffectStatus == 1)
+                {
+                    str = "生效中";
+                }
+                else if (this.EffectStatus == 2)
+                {
+                    str = "完成";
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 前置订单编号
+        /// </summary>
+        public int UpOrderId { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -131,5 +131,29 @@ namespace Edu.Model.ViewModel.Course
         /// 开班时间
         /// </summary>
         public DateTime OpenTime { get; set; }
+
+        /// <summary>
+        /// 生效状态字符串
+        /// </summary>
+        public string EffectStatusStr
+        {
+            get
+            {
+                string str = "";
+                if (this.EffectStatus == 0)
+                {
+                    str = "未生效";
+                }
+                else if (this.EffectStatus == 1)
+                {
+                    str = "生效中";
+                }
+                else if (this.EffectStatus == 2)
+                {
+                    str = "完成";
+                }
+                return str;
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -1093,6 +1093,10 @@ namespace Edu.Module.Course
                         item.IsChaBan,
                         item.StartClassHours,
                         item.CourseName,
+                        item.EffectStatus,
+                        item.EffectStatusStr,
+                        EffectTime = Common.ConvertHelper.FormatTime(item.EffectTime),
+                        item.UpOrderId,
                     });
                 }
             }

Edu.Module.Course/OrderModule.cs

@@ -450,13 +450,13 @@ namespace Edu.Module.Course
             {
                 if (orderModel.EffectStatus != 2)
                 {
-                    if (demodel.EffectTime > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                    if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
                     {
-                        demodel.EffectStatus = 1;
+                        demodel.EffectStatus = 0;
                     }
                     else
                     {
-                        demodel.EffectStatus = 0;
+                        demodel.EffectStatus = 1;
                     }
                 }
                 else
@@ -573,7 +573,7 @@ namespace Edu.Module.Course
             }
             else
             {
-                if (demodel.EffectTime > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
                 {
                     demodel.EffectStatus = 1;
                 }

Edu.Repository/Course/RB_OrderRepository.cs

@@ -102,7 +102,7 @@ namespace Edu.Repository.Course
             }
 
             string sql = $@" 
-SELECT o.*,c.ClassName,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName
+SELECT o.*,c.ClassName,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName,c.OpenTime
 FROM RB_Order o 
     LEFT JOIN rb_class c on o.ClassId = c.ClassId
     LEFT JOIN rb_teacher t on c.Teacher_Id = t.TId

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -61,6 +61,7 @@ namespace Edu.Repository.Course
 
             string sql = $@" 
 SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
+       ,B.EffectStatus,B.EffectTime,B.UpOrderId
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
      LEFT JOIN rb_course AS C ON B.CourseId=C.CourseId
 WHERE {where}";
@@ -135,7 +136,8 @@ WHERE 1=1 AND A.Status=0 {where}";
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.* ,IFNULL(course.CourseName,'') AS CourseName,tOrder.CourseId,tOrder.OrderType,tOrder.StartClassHours,tOrder.IsChaBan
+SELECT A.* ,IFNULL(course.CourseName,'') AS CourseName,tOrder.CourseId,tOrder.OrderType,tOrder.StartClassHours,tOrder.IsChaBan,tOrder.EffectTime
+       ,tOrder.EffectStatus,tOrder.UpOrderId
 FROM RB_Order_Guest AS A LEFT  JOIN RB_Order as tOrder ON A.OrderId=tOrder.OrderId
      LEFT JOIN rb_course AS course ON (tOrder.CourseId=course.CourseId AND tOrder.CourseId>0 AND tOrder.OrderType=1)
 WHERE 1=1 AND A.Status=0

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -180,6 +180,7 @@ namespace Edu.WebApi.Controllers.Course
                     {
                         x.OrderId,
                         x.ClassId,
+                        x.ClassName,
                         x.CourseId,
                         x.CourseName,
                         x.StartClassHours,
@@ -218,6 +219,11 @@ namespace Edu.WebApi.Controllers.Course
                         x.EduOccupation,
                         x.IsLessPrice,
                         x.LessPrice,
+                        OpenTime=Common.ConvertHelper.FormatDate(x.OpenTime),
+                        x.EffectStatus,
+                        x.EffectStatusStr,
+                        EffectTime = Common.ConvertHelper.FormatDate(x.EffectTime),
+                        x.UpOrderId,
                         SaleRemarkList = x.SaleRemarkList.Select(z => new
                         {
                             z.Id,
@@ -976,6 +982,10 @@ namespace Edu.WebApi.Controllers.Course
                 x.CourseName,
                 x.StartClassHours,
                 x.IsChaBan,
+                x.EffectStatus,
+                x.EffectStatusStr,
+                EffectTime=Common.ConvertHelper.FormatDate(x.EffectTime),
+                x.UpOrderId
             });
             return ApiResult.Success("", pageModel);
         }
@@ -1160,6 +1170,11 @@ namespace Edu.WebApi.Controllers.Course
                     x.OrderNature,
                     OrderNatureName = x.OrderNature.ToName(),
                     x.OldPreferPrice,
+                    x.EffectStatus,
+                    x.EffectStatusStr,
+                    EffectTime=Common.ConvertHelper.FormatDate(x.EffectTime),
+                    x.UpOrderId,
+                    OpenTime = Common.ConvertHelper.FormatDate(x.OpenTime),
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,
@@ -1302,6 +1317,10 @@ namespace Edu.WebApi.Controllers.Course
                     x.OrderNature,
                     OrderNatureName = x.OrderNature.ToName(),
                     x.OldPreferPrice,
+                    x.EffectStatus,
+                    x.EffectStatusStr,
+                    EffectTime = Common.ConvertHelper.FormatDate(x.EffectTime),
+                    x.UpOrderId,
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,