Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Repository/Course/RB_OrderRepository.cs

@@ -221,6 +221,10 @@ ORDER BY {orderBy}
                     where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.PlatformTax)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
                 }
             }
+            if (demodel.HelpEnterId > 0) 
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.HelpEnterId)} = {demodel.HelpEnterId}";
+            }
             string orderBy = " o.OrderId asc";
             if (demodel.Q_OrderBy == 1)
             {
@@ -260,6 +264,10 @@ where {where} order by {orderBy}
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.School_Id)} ={demodel.School_Id}";
             }
+            if (demodel.HelpEnterId > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.HelpEnterId)} = {demodel.HelpEnterId}";
+            }
             if (demodel.OrderId > 0)
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.OrderId)} ={demodel.OrderId}";

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1308,7 +1308,8 @@ namespace Edu.WebApi.Controllers.Course
                 Q_OrderState = base.ParmJObj.GetInt("Q_OrderState"),
                 Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
                 PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
-                EnterID = base.ParmJObj.GetInt("EnterID")
+                EnterID = base.ParmJObj.GetInt("EnterID"),
+                HelpEnterId = base.ParmJObj.GetInt("HelpEnterId",0)
             };
             demodel.Group_Id = userInfo.Group_Id;