页面修改

Edu.Model/Entity/Sell/RB_ReturnMoney_Batch.cs

 using System;
 using System.Collections.Generic;
 using System.Text;
+using VT.FW.DB;
 
 namespace Edu.Model.Entity.Sell
 {
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
     public class RB_ReturnMoney_Batch
     {
         /// <summary>

Edu.Module.Course/OrderModule.cs

@@ -121,10 +121,7 @@ namespace Edu.Module.Course
         /// 学生
         /// </summary>
         private readonly RB_StudentRepository studentRepository = new RB_StudentRepository();
-        /// <summary>
-        /// 学生日志
-        /// </summary>
-        private readonly RB_Student_LogRepository student_LogRepository = new RB_Student_LogRepository();
+ 
         /// <summary>
         /// 同行
         /// </summary>

Edu.Repository/Customer/RB_CustomerRepository.cs

@@ -87,6 +87,7 @@ WHERE 1=1
                     }
                 }
             }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Customer_Extend.CustomerId));
             return GetPage<RB_Customer_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -717,6 +717,10 @@ WHERE  1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4  AND b.Or
             {
                 builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_Extend.GuestName)} like '%{demodel.GuestName}%'");
             }
+            if (demodel.GuestState > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_Extend.GuestState)} ={(int)demodel.GuestState}");
+            }
             if (!string.IsNullOrEmpty(demodel.ClassNo))
             {
                 builder.AppendFormat($@" AND class.{nameof(RB_Order_Guest_Extend.ClassNo)} like '%{demodel.ClassNo}%'");

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -2325,7 +2325,6 @@ namespace Edu.WebApi.Controllers.Course
 
         #endregion
 
-
         #region 甲鹤小程序付款的课程同步过来
         /// <summary>
         /// 新增修改订单
@@ -2391,6 +2390,20 @@ namespace Edu.WebApi.Controllers.Course
 
 
 
+        #endregion
+
+        #region 获取学员状态列表
+        
+        /// <summary>
+        /// 获取学员状态列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetGuestStateList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(GuestStateEnum));
+            return ApiResult.Success(data: list);
+        }
         #endregion
     }
 }

Edu.WebApi/Controllers/Course/StuController.cs

@@ -304,6 +304,7 @@ namespace Edu.WebApi.Controllers.Course
                 EnterID = base.ParmJObj.GetInt("EnterID", 0),
                 JoinType = base.ParmJObj.GetInt("JoinType", 0),
                 EarlyWarning = (Common.Enum.Course.GuestClassHoursEarlyWarningEnum)base.ParmJObj.GetInt("EarlyWarning", 0),
+                GuestState=(GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
             };
             model.School_Id = -1;
             var schoolId = base.ParmJObj.GetStringValue("School_Id");