111

Edu.EducationCore/Edu.EducationCore.csproj

@@ -45,6 +45,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Edu.Module.Course\Edu.Module.Course.csproj" />
+    <ProjectReference Include="..\Edu.Module.Customer\Edu.Module.Customer.csproj" />
     <ProjectReference Include="..\Edu.Module.Finance\Edu.Module.Finance.csproj" />
     <ProjectReference Include="..\Edu.Module.OKR\Edu.Module.OKR.csproj" />
     <ProjectReference Include="..\Edu.Module.QYWeChat\Edu.Module.QYWeChat.csproj" />

Edu.EducationCore/Helper/QuarzHelper.cs

-using System;
-using System.Text;
-using Newtonsoft.Json;
-using System.IO;
+using Edu.Common;
+using Edu.Common.Plugin;
+using Edu.Module.Course;
+using Edu.Module.Customer;
+using Edu.Module.Finance;
+using Edu.Module.OKR;
+using Edu.Module.QYWeChat;
 using Quartz;
 using Quartz.Impl;
+using System;
 using System.Collections.Specialized;
-using System.Threading.Tasks;
-using Edu.Module.Course;
-using Edu.Module.OKR;
 using System.Linq;
-using System.Collections.Generic;
-using Edu.Module.Finance;
-using Edu.Module.QYWeChat;
+using System.Threading.Tasks;
 using System.Web;
-using Edu.Common.Plugin;
-using Edu.Common;
-using Edu.Module.Customer;
 
 namespace Edu.Education.Helper
 {
@@ -844,7 +840,7 @@ namespace Edu.Education.Helper
             {
                 LogHelper.Write("推送学员回访 Start***");
                 CustomerStudentModule customerStudentModule = new CustomerStudentModule();
-               var flag= customerStudentModule.PushStudentFollowUpModule();
+                var flag= customerStudentModule.PushStudentFollowUpModule();
                 LogHelper.Write("推送学员回访 End*** Flag:" + flag);
             }
             catch (Exception ex)

Edu.Repository/Course/RB_CourseRepository.cs

@@ -135,6 +135,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_ViewModel.IsScrollClass), query.IsScrollClass);
                 }
+                if (query.SaleState > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_ViewModel.SaleState), query.SaleState);
+                }
             }
             return Get<RB_Course_ViewModel>(builder.ToString(), parameters).ToList();
         }
@@ -228,6 +232,10 @@ WHERE 1=1
                         builder.AppendFormat(" AND t.GuestNum desc ");
                     }
                 }
+                if (query.SaleState > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_ViewModel.SaleState), query.SaleState);
+                }
             }
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Course_ViewModel.CourseId));
             return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -317,7 +317,8 @@ namespace Edu.WebApi.Controllers.Course
                 IsQTeacher = base.ParmJObj.GetInt("IsQTeacher"),
                 Saleplat = base.ParmJObj.GetStringValue("Saleplat"),
                 CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
-                Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy")
+                Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
+                SaleState = base.ParmJObj.GetInt("SaleState"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             var list = courseModule.GetCoursePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);

Edu.WebApi/Controllers/Web/WebController.cs

@@ -335,7 +335,8 @@ namespace Edu.WebApi.Controllers.Web
                 Status = (DateStateEnum)base.ParmJObj.GetInt("Status"),
                 IsQPrice = base.ParmJObj.GetInt("IsQPrice"),
                 IsQTeacher = base.ParmJObj.GetInt("IsQTeacher"),
-                Group_Id = base.ParmJObj.GetInt("Group_Id")
+                Group_Id = base.ParmJObj.GetInt("Group_Id"),
+                SaleState=base.ParmJObj.GetInt("SaleState"),
             };
             if (query.Group_Id <= 0)
             {