页面修改

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -151,5 +151,10 @@ namespace Edu.Model.ViewModel.Course
         /// 前置订单编号
         /// </summary>
         public int UpOrderId { get; set; }
+
+        /// <summary>
+        /// 续课订单编号
+        /// </summary>
+        public int RenewOrderId { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -1227,7 +1227,8 @@ namespace Edu.Module.Course
                         item.Mobile,
                         item.OrderId,
                         ClassHours = item.CompleteHours + "-" + (classModel?.ClassHours ?? 0),
-                        IsRenew = courseModel?.IsRenew ?? 0,
+                        IsRenew = item.RenewOrderId>0?1:0,
+                        item.RenewOrderId,
                         CheckStatus = checkStatus,
                         item.IsChaBan,
                         item.StartClassHours,

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -65,7 +65,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,B.OrderType,B.CourseId
+       ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.RenewOrderId
 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 AND B.CourseId>0 AND B.OrderType=1)
 WHERE {where}";

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -231,6 +231,7 @@ namespace Edu.WebApi.Controllers.Course
                         EffectTime = Common.ConvertHelper.FormatDate(x.EffectTime),
                         x.UpOrderId,
                         x.VisitorReserveId,
+                        x.RenewOrderId,
                         SaleRemarkList = x.SaleRemarkList.Select(z => new
                         {
                             z.Id,
@@ -1229,6 +1230,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.UpOrderId,
                     OpenTime = Common.ConvertHelper.FormatDate(x.OpenTime),
                     x.VisitorReserveId,
+                    x.RenewOrderId,
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,
@@ -1380,6 +1382,7 @@ namespace Edu.WebApi.Controllers.Course
                     EffectTime = Common.ConvertHelper.FormatDate(x.EffectTime),
                     x.UpOrderId,
                     x.VisitorReserveId,
+                    x.RenewOrderId,
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,