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

Edu.Common/Config.cs

@@ -510,6 +510,15 @@ namespace Edu.Common
             }
         }
 
+        /// <summary>
+        /// 销售发放提成的前提比例
+        /// </summary>
+        public static string SellCommissionFFBL {
+            get {
+                return ReadConfigKey("SellCommissionFFBL");
+            }
+        }
+
         /// <summary>
         /// 收入请求加密
         /// </summary>

Edu.Model/Entity/Course/RB_Order.cs

@@ -211,8 +211,67 @@ namespace Edu.Model.Entity.Course
         public int StartClassHours { get; set; }
 
         /// <summary>
-        /// 是否插班报入
+        /// 是否插班报入(1是)
         /// </summary>
         public int IsChaBan { get; set; }
+
+        /// <summary>
+        /// 销售返佣类型  0百分比   1固定值
+        /// </summary>
+        public decimal CommissionType { get; set; }
+
+        /// <summary>
+        /// 提成比例/固定值
+        /// </summary>
+        public decimal CommissionRate { get; set; }
+
+        /// <summary>
+        /// 销售返佣类型  0百分比   1固定值 （同行）
+        /// </summary>
+        public decimal CommissionTypeTH { get; set; }
+
+        /// <summary>
+        /// 提成比例/固定值 （同行）
+        /// </summary>
+        public decimal CommissionRateTH { get; set; }
+
+        /// <summary>
+        /// 提成补交
+        /// </summary>
+        public decimal CommissionBack { get; set; }
+
+        /// <summary>
+        /// 提成备注： 记录下单时  使用的 比例
+        /// </summary>
+        public string CommissionRemark { get; set; }
+
+        /// <summary>
+        /// 额外提成已发放金额
+        /// </summary>
+        public decimal ExtraCommissionMoney { get; set; }
+
+        /// <summary>
+        /// 提成是否发放完毕   1是  0否
+        /// </summary>
+        public int IsCommissionGiveOK { get; set; }
+
+        /// 生效时间
+        /// </summary>
+        public DateTime EffectTime { get; set; }
+
+        /// <summary>
+        /// 生效状态(0-未生效，1-生效中，2-完成)
+        /// </summary>
+        public int EffectStatus { get; set; }
+
+        /// <summary>
+        /// 前置订单编号
+        /// </summary>
+        public int UpOrderId { get; set; }
+
+        /// <summary>
+        /// 预约单号
+        /// </summary>
+        public int VisitorReserveId { get; set; }
     }
 }

Edu.Model/Entity/Course/RB_Sell_Commission_Deduction.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 销售提成抵扣实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Sell_Commission_Deduction
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 订单id (需抵扣的订单Id)
+        /// </summary>
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 来源id(抵扣订单Id)
+        /// </summary>
+        public int SourceId { get; set; }
+
+        /// <summary>
+        /// 类型  1抵扣
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 抵扣金额
+        /// </summary>
+        public decimal DeductionMoney { get; set; }
+
+        /// <summary>
+        /// 抵扣额外
+        /// </summary>
+        public decimal DeductionExtraMoney { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 集团id
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 期数id
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 周期id
+        /// </summary>
+        public int PeriodsId { get; set; }
+
+    }
+}

Edu.Model/Entity/Course/RB_Sell_Commission_Details.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 销售提成期数明细实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Sell_Commission_Details
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 关联用户
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 班级id
+        /// </summary>
+        public int ClassId { get; set; }
+
+        /// <summary>
+        /// 班级类型  1学生班   2社会班
+        /// </summary>
+        public int ClassType { get; set; }
+
+        /// <summary>
+        /// 订单ID
+        /// </summary>
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 提成总金额（不是发放的）
+        /// </summary>
+        public decimal CommissionMoney { get; set; }
+
+        /// <summary>
+        /// 期数id
+        /// </summary>
+        public int PeriodId { get; set; }
+
+        /// <summary>
+        /// 期号
+        /// </summary>
+        public string Periods { get; set; }
+
+        /// <summary>
+        /// 额外奖励
+        /// </summary>
+        public decimal OtherMoney { get; set; }
+
+        /// <summary>
+        /// 额外扣除
+        /// </summary>
+        public decimal BackMoney { get; set; }
+
+        /// <summary>
+        /// 部门id
+        /// </summary>
+        public int Depart_Id { get; set; }
+
+        /// <summary>
+        /// 校区id
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 集团id
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 备注， 记录抵扣金额等等
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 学生数量
+        /// </summary>
+        public int StudentCount { get; set; }
+
+        /// <summary>
+        /// 当期提成金额
+        /// </summary>
+        public decimal CurrentPeriodMoney { get; set; }
+
+        /// <summary>
+        /// 当期发放额外提成
+        /// </summary>
+        public decimal CurrentExtraMoney { get; set; }
+
+        /// <summary>
+        /// 是否首次发放提成  1是  其他否
+        /// </summary>
+        public int IsFirstCommission { get; set; }
+
+        /// <summary>
+        /// 总课时
+        /// </summary>
+        public int TotalHours { get; set; }
+
+        /// <summary>
+        /// 累计消费课时
+        /// </summary>
+        public int TotalLearn { get; set; }
+
+        /// <summary>
+        /// 当期课时消耗
+        /// </summary>
+        public int CurrentHours { get; set; }
+
+        /// <summary>
+        /// 是否续班  1是  其他否
+        /// </summary>
+        public int IsContinueClass { get; set; }
+
+        /// <summary>
+        /// 累计已发放金额
+        /// </summary>
+        public decimal GiveOutMoney { get; set; }
+
+        /// <summary>
+        /// 销售提成比例
+        /// </summary>
+        public decimal SalesRate { get; set; }
+        /// <summary>
+        /// 老师比例
+        /// </summary>
+        public decimal TeacherRate { get; set; }
+        /// <summary>
+        /// 助教比例
+        /// </summary>
+        public decimal AssistantRate { get; set; }
+        /// <summary>
+        /// 首次发放比例
+        /// </summary>
+        public decimal FirstRate { get; set; }
+
+        /// <summary>
+        /// 抵扣订单
+        /// </summary>
+        public int DeductionOrder { get; set; }
+
+        /// <summary>
+        /// 抵扣金额
+        /// </summary>
+        public decimal DeductionMoney { get; set; }
+
+        /// <summary>
+        /// 抵扣额外奖励
+        /// </summary>
+        public decimal DeductionExtraMoney { get; set; }
+
+    }
+}

Edu.Model/Entity/Course/RB_Sell_Commission_Periods.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 销售提成期数实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Sell_Commission_Periods
+    {
+        /// <summary>
+        ///  编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 期数
+        /// </summary>
+        public string Periods { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 累计金额
+        /// </summary>
+        public decimal SumPrice { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 关联财务单据ids
+        /// </summary>
+        public string Financials { get; set; }
+
+    }
+}

Edu.Model/Entity/Course/RB_Sell_Commission_Rule.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 销售提成规则实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Sell_Commission_Rule
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 班级类型  
+        /// </summary>
+        public int ClassType { get; set; }
+
+        /// <summary>
+        /// 报名类型  1初次   2续班
+        /// </summary>
+        public int EnrollType { get; set; }
+
+        /// <summary>
+        /// 销售提成比例
+        /// </summary>
+        public decimal SalesRate { get; set; }
+
+        /// <summary>
+        /// 老师比例
+        /// </summary>
+        public decimal TeacherRate { get; set; }
+
+        /// <summary>
+        /// 助教比例
+        /// </summary>
+        public decimal AssistantRate { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 首次发放比例
+        /// </summary>
+        public decimal FirstRate { get; set; }
+
+    }
+}

Edu.Model/Entity/Reserve/RB_Reserve_Class.cs

+using Edu.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 约课班级信息实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_Class
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int ReserveClassId { get; set; }
+
+		/// <summary>
+		/// 教师编号
+		/// </summary>
+		public int TeacherId { get; set; }
+
+		/// <summary>
+		/// 上课日期
+		/// </summary>
+		public DateTime ClassDate { get; set; }
+
+		/// <summary>
+		/// 上课时间
+		/// </summary>
+		public string ClassTime { get; set; }
+
+		/// <summary>
+		/// 教室编号
+		/// </summary>
+		public int ClassRoomId { get; set; }
+
+		/// <summary>
+		/// 上课内容
+		/// </summary>
+		public string ClassContent { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 更新时间
+		/// </summary>
+		public DateTime UpdateTime { get; set; }
+
+		/// <summary>
+		/// 删除状态(0-正常,1-禁用)
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 结束时间
+		/// </summary>
+		public string EndTime { get; set; }
+	}
+}

Edu.Model/Entity/Reserve/RB_Visitor_Reserve.cs

+using Edu.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 访客约课表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Visitor_Reserve
+    {
+		/// <summary>
+		/// 预约编号(主键)
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 访客编号
+		/// </summary>
+		public int Visitor_Id { get; set; }
+
+		/// <summary>
+		/// 预约状态(0-跟进中,1-成交，2-流单,3-取消）
+		/// </summary>
+		public int ReserveStatus { get; set; }
+
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string Remark { get; set; }
+
+		/// <summary>
+		/// 关联订单号
+		/// </summary>
+		public int OrderId { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 更新时间
+		/// </summary>
+		public DateTime UpdateTime { get; set; }
+
+		/// <summary>
+		/// 删除状态(0-正常,1-禁用)
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 预约班级编号
+		/// </summary>
+		public int ReserveClassId { get; set; }
+	}
+}

Edu.Model/ViewModel/Course/RB_Class_Check_ViewModel.cs

@@ -20,6 +20,29 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string StartDate { get; set; }
 
+        /// <summary>
+        /// 月份
+        /// </summary>
+        public string MonthDateStr { get; set; }
+
+        /// <summary>
+        /// 月份日期
+        /// </summary>
+        public DateTime? MonthDate
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(this.MonthDateStr))
+                {
+                    return Convert.ToDateTime(this.MonthDateStr);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+        }
+
         /// <summary>
         /// ids
         /// </summary>
@@ -31,9 +54,9 @@ namespace Edu.Model.ViewModel.Course
         public int CheckNum { get; set; }
 
         /// <summary>
-        /// 已上课分钟数
+        /// 订单id
         /// </summary>
-        public int MinutesNum { get; set; }
+        public int OrderId { get; set; }
 
         /// 学员名称
         /// </summary>

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -192,6 +192,20 @@ namespace Edu.Model.ViewModel.Course
         /// 关联其他课程列表
         /// </summary>
         public List<RB_Class_Course_Extend> OtherCourseList { get; set; }
+
+        /// <summary>
+        /// 班级状态字符串
+        /// </summary>
+        public string ClassStatusStr
+        {
+            get
+            {
+                string str = "";
+                str = Common.Plugin.EnumHelper.ToName(this.ClassStatus);
+                return str;
+            }
+        }
+
     }
 
     /// <summary>

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -104,5 +104,49 @@ namespace Edu.Model.ViewModel.Course
         /// 是否插班报入(1-是)
         /// </summary>
         public int IsChaBan { get; set; }
+
+        /// <summary>
+        /// 生效时间
+        /// </summary>
+        public DateTime EffectTime { get; set; }
+
+        /// <summary>
+        /// 生效状态(1-正常，2-全部)
+        /// </summary>
+        public int QEffectStatus { 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_Remark_ViewModel.cs

@@ -13,5 +13,10 @@ namespace Edu.Model.ViewModel.Course
         /// 姓名
         /// </summary>
         public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 订单编号【查询使用】
+        /// </summary>
+        public string QOrderIds { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -14,6 +14,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassIds { get; set; }
 
+        /// <summary>
+        /// 课程课时
+        /// </summary>
+        public int ClassHours { get; set; }
+
         /// <summary>
         /// 项目ids
         /// </summary>
@@ -59,6 +64,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int Q_NotCollect { get; set; }
 
+        /// <summary>
+        /// 生效日期
+        /// </summary>
+        public string Q_EffectTime { get; set; }
+
         /// <summary>
         /// 销售备注
         /// </summary>
@@ -127,6 +137,33 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string CourseName { get; set; }
 
-
+        /// <summary>
+        /// 开班时间
+        /// </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.Model/ViewModel/Course/RB_Sell_Commission_Deduction_ViewModel.cs

+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 销售提成抵扣扩展类
+    /// </summary>
+    [Serializable]
+    public class RB_Sell_Commission_Deduction_ViewModel : Model.Entity.Course.RB_Sell_Commission_Deduction
+    {
+        /// <summary>
+        /// 订单ids
+        /// </summary>
+        public string OrderIds { get; set; }
+
+        /// <summary>
+        /// 来源ids
+        /// </summary>
+        public string SourceIds { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Sell_Commission_Details_ViewModel.cs

+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 销售提成期数明细实体类
+    /// </summary>
+    [Serializable]
+    public class RB_Sell_Commission_Details_ViewModel : Model.Entity.Course.RB_Sell_Commission_Details
+    {
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DeptName { get; set; }
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 班级类型
+        /// </summary>
+        public string ClassTypeName { get; set; }
+
+        /// <summary>
+        /// 订单ids
+        /// </summary>
+        public string OrderIds { get; set; }
+
+        /// <summary>
+        /// 是否需抵扣  1是
+        /// </summary>
+        public int IsDeduction { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Sell_Commission_Periods_ViewModel.cs

+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 销售提成期数实体类
+    /// </summary>
+    [Serializable]
+    public class RB_Sell_Commission_Periods_ViewModel : Model.Entity.Course.RB_Sell_Commission_Periods
+    {
+        /// <summary>
+        /// 校区id
+        /// </summary>
+        public int SchoolId { get; set; }
+
+        /// <summary>
+        /// 该校区提成
+        /// </summary>
+        public decimal SchooldCommission { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Sell_Commission_Rule_ViewModel.cs

+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 销售提成规则实体类
+    /// </summary>
+    [Serializable]
+    public class RB_Sell_Commission_Rule_ViewModel : Model.Entity.Course.RB_Sell_Commission_Rule
+    {
+        
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Finance/RB_Finance_Extend.cs

@@ -15,6 +15,10 @@ namespace Edu.Model.ViewModel.Finance
     [DB(ConnectionName = "FinanceConnection")]
     public class RB_Finance_Extend : RB_Finance
     {
+        /// <summary>
+        /// 关联ids
+        /// </summary>
+        public string ReFinanceIds { get; set; }
 
         /// <summary>
         /// 审批人信息

Edu.Model/ViewModel/Reserve/RB_Reserve_Class_Extend.cs

+using Edu.Model.Entity.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Reserve
+{
+    /// <summary>
+    /// 约课班级信息扩展实体类
+    /// </summary>
+    public class RB_Reserve_Class_Extend : RB_Reserve_Class
+    {
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string StartClassDate { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string EndClassDate { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 教室名称
+        /// </summary>
+        public string RoomName { get; set; }
+
+        /// <summary>
+        /// 教室座位数
+        /// </summary>
+        public int RoomNum { get; set; }
+
+        /// <summary>
+        /// 报名人数
+        /// </summary>
+        public int JoinNum { get; set; }
+
+        /// <summary>
+        /// 预约日期字符串
+        /// </summary>
+        public string ClassDateStr { get { return Common.ConvertHelper.FormatDate(this.ClassDate); } }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
+    }
+}

Edu.Model/ViewModel/Reserve/RB_Visitor_Reserve_Extend.cs

+using Edu.Model.Entity.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Reserve
+{
+    /// <summary>
+    /// 访客约课扩展实体类
+    /// </summary>
+    public class RB_Visitor_Reserve_Extend : RB_Visitor_Reserve
+    {
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        #region 约课班级信息
+
+        /// <summary>
+        /// 预约日期
+        /// </summary>
+        public DateTime ClassDate { get; set; }
+
+        /// <summary>
+        /// 预约时间
+        /// </summary>
+        public string ClassTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 教师编号
+        /// </summary>
+        public int TeacherId { get; set; }
+
+        /// <summary>
+        /// 教室编号
+        /// </summary>
+        public int ClassRoomId { get; set; }
+
+        /// <summary>
+        /// 预约内容
+        /// </summary>
+        public string ClassContent { get; set; }
+
+        #endregion
+
+        #region 扩展字段
+
+        /// <summary>
+        /// 约课日期
+        /// </summary>
+        public string ClassDateStr { get { return Common.ConvertHelper.FormatDate(this.ClassDate); } }
+
+        /// <summary>
+        /// 访客名称
+        /// </summary>
+        public string VisitorName { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 教室名称
+        /// </summary>
+        public string RoomName { get; set; }
+        #endregion
+
+        /// <summary>
+        /// 预约班级编号
+        /// </summary>
+        public string Q_ReserveClassIds { get; set; }
+
+        /// <summary>
+        /// 预约状态(0-跟进中,1-成交，2-流单,3-取消）
+        /// </summary>
+        public string Q_ReserveStatus { get; set; }
+
+        /// <summary>
+        /// 报名人数
+        /// </summary>
+        public int JoinNum { get; set; }
+
+        /// <summary>
+        /// 预约状态字符串
+        /// </summary>
+        public string ReserveStatusStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.ReserveStatus)
+                {
+                    case 0: str = "跟进中"; break;
+                    case 1: str = "成交"; break;
+                    case 2: str = "流单"; break;
+                    case 3: str = "取消"; break;
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string StartClassDate { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string EndClassDate { get; set; }
+    }
+}

Edu.Module.Course/CourseOfferModule.cs

@@ -33,6 +33,10 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
         /// <summary>
+        /// 班级
+        /// </summary>
+        private readonly RB_ClassRepository classRepository = new RB_ClassRepository();
+        /// <summary>
         /// 订单备注
         /// </summary>
         private readonly RB_Order_RemarkRepository order_RemarkRepository = new RB_Order_RemarkRepository();
@@ -49,6 +53,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly CourseModule courseModule = new CourseModule();
 
+        /// <summary>
+        /// 课程优惠仓储层对象
+        /// </summary>
+        private readonly RB_Course_PreferentialRepository course_PreferentialRepository = new RB_Course_PreferentialRepository();
+
         /// <summary>
         /// 留学就业仓储层对象
         /// </summary>
@@ -387,6 +396,44 @@ namespace Edu.Module.Course
                     {
                         orderModel.OrderType = OrderTypeEnum.CourseOrder;
                         orderModel.SourceId = 0;
+                        #region 计算订单提成信息       
+                        int CourseId = classRepository.GetEntity(orderModel.ClassId)?.CouseId ?? 0;
+                        if (CourseId > 0)
+                        {
+                            //获取课程优惠
+                            var coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
+                            {
+                                CourseId = CourseId
+                            });
+                            RB_Course_Preferential_Extend coursePreferentialModel = null;
+                            if (coursePreferentialList != null && coursePreferentialList.Count > 0)
+                            {
+                                if (orderModel.GuestNum == 1)
+                                {
+                                    coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == Common.Enum.Course.CoursePriceDiscountEnum.SingleJoin)?.FirstOrDefault();
+                                }
+                                if (orderModel.GuestNum >= 2)
+                                {
+                                    coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == Common.Enum.Course.CoursePriceDiscountEnum.DoubleJoin)?.FirstOrDefault();
+                                }
+
+                                #region 记录提成信息
+                                if (coursePreferentialModel == null)
+                                {
+                                    coursePreferentialModel = coursePreferentialList.FirstOrDefault();
+                                }
+                                orderModel.CommissionType = coursePreferentialModel?.SaleCommissionType ?? 0;
+                                orderModel.CommissionRate = coursePreferentialModel?.SaleCommissionMoney ?? 0;
+                                orderModel.CommissionTypeTH = coursePreferentialModel?.B2BCommissionType ?? 0;
+                                orderModel.CommissionRateTH = coursePreferentialModel?.B2BCommissionMoney ?? 0;
+                                if (coursePreferentialModel != null)
+                                {
+                                    orderModel.CommissionRemark = "使用优惠Id:" + coursePreferentialModel.Id + " 返佣类型:" + orderModel.CommissionType + " 返佣比例/金额:" + orderModel.CommissionRate + " 同行返佣类型:" + orderModel.CommissionTypeTH + " 同行返佣比例/金额:" + orderModel.CommissionRateTH;
+                                }
+                                #endregion
+                            }
+                        }
+                        #endregion
                     }
                     else
                     {

Edu.Module.Course/EducationContractModule.cs

@@ -90,7 +90,7 @@ namespace Edu.Module.Course
         public object GetStudentInfoModule(int OrderId, int GuestId)
         {
             var obj = new object();
-            var glist = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderId = OrderId, GuestState = 1 });
+            var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = OrderId, GuestState = 1 });
             var orderModel = orderRepository.GetEntity(OrderId);
             var guestModel = glist.Where(qitem => qitem.Id == GuestId)?.FirstOrDefault();
             var classModel = new RB_Class_ViewModel();

Edu.Module.Course/OrderModule2.cs

@@ -245,5 +245,46 @@ namespace Edu.Module.Course
             }
             return flag;
         }
+
+        /// <summary>
+        /// 处理订单生效状态
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool DealOrderEffectStatusModule()
+        {
+            bool flag = false;
+            var orderList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel()
+            {
+                OrderState = Common.Enum.Course.OrderStateEnum.Normal,
+                IsChaBan = 1,
+                Q_EffectTime = Common.ConvertHelper.FormatDate(DateTime.Now)
+            });
+            if (orderList != null && orderList.Count > 0)
+            {
+                var tempOrderList = orderList.Where(qitem => qitem.EffectStatus == 0)?.ToList();
+                if (tempOrderList != null && tempOrderList.Count > 0)
+                {
+                    foreach (var item in tempOrderList)
+                    {
+                        Dictionary<string, object> fileds1 = new Dictionary<string, object>()
+                        {
+                            { nameof(RB_Order_ViewModel.EffectStatus),1 }
+                        };
+                        //更新当前订单为“生效中”
+                        flag = orderRepository.Update(fileds1, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), item.OrderId));
+                        if (item.UpOrderId > 0)
+                        {
+                            Dictionary<string, object> fileds2 = new Dictionary<string, object>()
+                            {
+                                { nameof(RB_Order_ViewModel.EffectStatus),2 }
+                            };
+                            //更新前置订单为“完成”
+                            flag = orderRepository.Update(fileds2, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), item.UpOrderId));
+                        }
+                    }
+                }
+            }
+            return flag;
+        }
     }
 }

Edu.Module.Course/StudentBillModule.cs

@@ -40,6 +40,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Student_BackRecordRepository student_BackRecordRepository = new RB_Student_BackRecordRepository();
 
+        /// <summary>
+        /// 课程优惠仓储层对象
+        /// </summary>
+        private readonly RB_Course_PreferentialRepository course_PreferentialRepository = new RB_Course_PreferentialRepository();
+
         /// <summary>
         /// 旅客表仓储层对象
         /// </summary>
@@ -580,7 +585,7 @@ namespace Edu.Module.Course
             bool flag = student_BackClassRepository.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), backModel.BackId));
             if (flag)
             {
-                var guestList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
+                var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
                 if (guestList != null && guestList.Where(qitem => qitem.GuestState == 2).Count() == guestList.Count())
                 {
                     //更新订单为退学状态
@@ -992,6 +997,45 @@ namespace Edu.Module.Course
             orderModel.OrderState = OrderStateEnum.Normal;
             orderModel.OrderSource = oldOrderModel.OrderSource;
             orderModel.OrderForm = oldOrderModel.OrderForm;
+            int CourseId = classModel?.CouseId ?? 0;
+
+            #region 计算订单提成信息       
+            if (CourseId > 0)
+            {
+                //获取课程优惠
+                var coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
+                {
+                    CourseId = CourseId
+                });
+                RB_Course_Preferential_Extend coursePreferentialModel = null;
+                if (coursePreferentialList != null && coursePreferentialList.Count > 0)
+                {
+                    if (orderModel.GuestNum == 1)
+                    {
+                        coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.SingleJoin)?.FirstOrDefault();
+                    }
+                    if (orderModel.GuestNum >= 2)
+                    {
+                        coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.DoubleJoin)?.FirstOrDefault();
+                    }
+
+                    #region 记录提成信息
+                    if (coursePreferentialModel == null)
+                    {
+                        coursePreferentialModel = coursePreferentialList.FirstOrDefault();
+                    }
+                    orderModel.CommissionType = coursePreferentialModel?.SaleCommissionType ?? 0;
+                    orderModel.CommissionRate = coursePreferentialModel?.SaleCommissionMoney ?? 0;
+                    orderModel.CommissionTypeTH = coursePreferentialModel?.B2BCommissionType ?? 0;
+                    orderModel.CommissionRateTH = coursePreferentialModel?.B2BCommissionMoney ?? 0;
+                    if (coursePreferentialModel != null)
+                    {
+                        orderModel.CommissionRemark = "使用优惠Id:" + coursePreferentialModel.Id + " 返佣类型:" + orderModel.CommissionType + " 返佣比例/金额:" + orderModel.CommissionRate + " 同行返佣类型:" + orderModel.CommissionTypeTH + " 同行返佣比例/金额:" + orderModel.CommissionRateTH;
+                    }
+                    #endregion
+                }
+            }
+            #endregion
 
             //新增订单
             var newOrderId = orderRepository.Insert(orderModel);

Edu.Module.Finance/FinanceModule.cs

@@ -309,7 +309,7 @@ namespace Edu.Module.Finance
             {
                 string classIds = string.Join(",", classList.Select(x => x.ClassId));
                 //根据班级查询所有的订单列表
-                orderAllList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = GroupId, ClassIds = classIds, OrderType = Common.Enum.Sale.OrderTypeEnum.CourseOrder, Q_OrderState = 1 });
+                orderAllList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel() { Group_Id = GroupId, ClassIds = classIds, OrderType = Common.Enum.Sale.OrderTypeEnum.CourseOrder, Q_OrderState = 1 });
                 //查询班级下所有的财务单据
                 FAllList = RB_FinanceRepository.GetDataStatisticsListThree(new RB_Finance_Extend() { TCIDStr = classIds, OrderSource = OrderResourceEnum.Education });
                 teacherBonusList = teaching_BonusDetailRepository.GetList(new RB_Teaching_BonusDetail_ViewModel { Group_Id = GroupId, ClassIds = classIds });
@@ -424,7 +424,7 @@ namespace Edu.Module.Finance
             if (saList.Any()) {
                 string saIds = string.Join(",", saList.Select(x => x.Id));
                 //根据班级查询所有的订单列表
-                orderAllList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = GroupId, SourceIds = saIds, OrderType = Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder, Q_OrderState = 1 });
+                orderAllList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel() { Group_Id = GroupId, SourceIds = saIds, OrderType = Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder, Q_OrderState = 1 });
                 //查询班级下所有的财务单据
                 FAllList = RB_FinanceRepository.GetDataStatisticsListThree(new RB_Finance_Extend() { TCIDStr = saIds, OrderSource = OrderResourceEnum.EducationStudy });
             }

Edu.Module.User/obj/Debug/netcoreapp3.0/Edu.Module.User.AssemblyInfo.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     This code was generated by a tool.
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -384,8 +384,57 @@ GROUP BY A.ClassId
         /// <returns></returns>
         public List<RB_Class_Check_ViewModel> GetClassGuestStudentTimeList(int groupId, string guestIds)
         {
-            string sql = $@"SELECT OrderGuestId, SUM(StudyNum) as MinutesNum FROM rb_class_check where `Status`=0 and Group_Id ={groupId} and CheckStatus =0 and OrderGuestId in ({guestIds}) group by OrderGuestId";
+            string sql = $@"SELECT OrderGuestId, SUM(CurrentDeductionHours) as CurrentDeductionHours FROM rb_class_check where `Status`=0 and Group_Id ={groupId} and OrderGuestId in ({guestIds}) group by OrderGuestId";
             return Get<RB_Class_Check_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取学生的上课课时
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="guestIds"></param>
+        /// <returns></returns>
+        public List<RB_Class_Check_ViewModel> GetClassStudentDeductionHoursList(int groupId, string guestIds)
+        {
+            string sql = $@"SELECT OrderGuestId, SUM(CurrentDeductionHours) as CurrentDeductionHours FROM rb_class_check where `Status`=0 and Group_Id ={groupId} and OrderGuestId in ({guestIds}) group by OrderGuestId";
+            return Get<RB_Class_Check_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取学生的上课课时
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Class_Check_ViewModel> GetClassStudentHoursListForOrder(int groupId, string orderIds)
+        {
+            string sql = $@"SELECT g.Id as OrderGuestId,g.OrderId,SUM(c.CurrentDeductionHours) CurrentDeductionHours FROM rb_order_guest g
+left join rb_class_check c on g.Id = c.OrderGuestId
+WHERE g.Group_Id ={groupId} and g.`Status`=0 and g.GuestState <>2 and c.`Status` =0 and g.OrderId in({orderIds})
+group by g.Id;";
+            return Get<RB_Class_Check_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取订单每月 消费课时
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Class_Check_ViewModel> GetClassStudentHoursListForOrderMonth(int groupId, string orderIds)
+        {
+            string sql = $@"SELECT g.OrderId,DATE_FORMAT(c.CreateTime,'%Y-%m') as MonthDateStr,SUM(c.CurrentDeductionHours) CurrentDeductionHours FROM rb_order_guest g
+left join rb_class_check c on g.Id = c.OrderGuestId
+WHERE g.Group_Id ={groupId} and g.`Status`=0 and g.GuestState <>2 and c.`Status` =0 and g.OrderId in({orderIds})
+group by g.OrderId,DATE_FORMAT(c.CreateTime,'%Y-%m');";
+            return Get<RB_Class_Check_ViewModel>(sql).ToList();
+        }
+
+        public bool ClearCheck()
+        {
+            string sql = " TRUNCATE TABLE rb_class_check ";
+            base.ExecuteScalar(sql);
+            return true;
+        }
     }
 }

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -78,7 +78,8 @@ WHERE 1=1
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
-       ,Time.StartTime,time.EndTime,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
+       ,Time.StartTime,time.EndTime,time.ClassTimeId
+       ,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
 FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
      LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
      LEFT JOIN rb_class_time AS time ON A.ClassPlanId=Time.ClassPlanId
@@ -99,6 +100,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
                 }
+                if (query.TeacherId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.TeacherId), query.TeacherId);
+                }
                 if (query.School_Id > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
@@ -123,6 +128,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
                 }
+                if (!string.IsNullOrEmpty(query.QClassDateStr))
+                {
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y/%m/%d')= DATE_FORMAT('{1}','%y/%m/%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.QClassDateStr);
+                }
             }
             return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
         }

Edu.Repository/Course/RB_OrderRepository.cs

@@ -20,9 +20,9 @@ namespace Edu.Repository.Course
         /// </summary>
         /// <param name="demodel"></param>
         /// <returns></returns>
-        public List<RB_Order_ViewModel> GetList(RB_Order_ViewModel demodel)
+        public List<RB_Order_ViewModel> GetOrderListRepository(RB_Order_ViewModel demodel)
         {
-            string where = $@" 1=1";
+            string where = $@" 1=1 ";
             if (demodel.Group_Id > 0)
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.Group_Id)} ={demodel.Group_Id}";
@@ -90,7 +90,14 @@ namespace Edu.Repository.Course
                     where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} =3";
                 }
             }
-
+            if (demodel.IsChaBan ==1 )
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.IsChaBan)} ={demodel.IsChaBan}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Q_EffectTime))
+            {
+                where += string.Format(" and DATE_FORMAT(o.EffectTime,'%y/%m/%d')=DATE_FORMAT('{0}','%y/%m/%d') ", demodel.Q_EffectTime);
+            }
             string orderBy = " o.OrderId asc";
             if (demodel.Q_OrderBy == 1)
             {
@@ -102,7 +109,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,IFNULL(course.ClassHours,0) AS ClassHours
 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
@@ -121,7 +128,7 @@ ORDER BY {orderBy}
         /// <param name="rowsCount"></param>
         /// <param name="demodel"></param>
         /// <returns></returns>
-        public List<RB_Order_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_ViewModel demodel)
+        public List<RB_Order_ViewModel> GetOrderPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_ViewModel demodel)
         {
             string where = $@" 1=1";
             where += $@" and o.{nameof(RB_Order_ViewModel.OrderType)} ={(int)OrderTypeEnum.CourseOrder} ";
@@ -223,7 +230,7 @@ ORDER BY {orderBy}
             }
 
             string sql = $@" 
-select o.*,c.ClassName,c.School_Id as ClassSchoolId,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName
+select o.*,c.ClassName,c.School_Id as ClassSchoolId,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
@@ -239,7 +246,7 @@ where {where} order by {orderBy}
         /// </summary>
         /// <param name="demodel"></param>
         /// <returns></returns>
-        public RB_Order_ViewModel GetMyOrderStatistics(RB_Order_ViewModel demodel)
+        public RB_Order_ViewModel GetMyOrderStatisticsRepository(RB_Order_ViewModel demodel)
         {
             string where = $@" 1=1";
             where += $@" and o.{nameof(RB_Order_ViewModel.OrderType)} ={(int)OrderTypeEnum.CourseOrder} ";
@@ -419,7 +426,6 @@ where {where}
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.OrderType)} ={(int)demodel.OrderType} ";
             }
-
             string orderBy = " o.OrderId asc";
             if (demodel.Q_OrderBy == 1)
             {
@@ -478,7 +484,6 @@ WHERE {where} ORDER BY {orderBy}
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.Dept_Id)} ={demodel.Dept_Id}";
             }
-            
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {
                 if (demodel.Group_Id > 0)
@@ -490,7 +495,6 @@ WHERE {where} ORDER BY {orderBy}
                     where += $@" and o.OrderId in (select OrderId from rb_order_guest where Status =0 and GuestName like '%{demodel.GuestName}%')";
                 }
             }
-            
             if (!string.IsNullOrEmpty(demodel.StartTime))
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.CreateTime)} >='{demodel.StartTime}'";
@@ -499,12 +503,10 @@ WHERE {where} ORDER BY {orderBy}
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.CreateTime)} <='{demodel.EndTime} 23:59:59'";
             }
-           
             if (demodel.Q_NotCollect == 1)
             {
                 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)}) ";
             }
-
             string sql = $@" 
 SELECT SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferPrice,
         SUM(CASE WHEN o.OrderState <> 3 THEN o.Income ELSE 0 END) AS Income,
@@ -524,10 +526,50 @@ WHERE {where}
         /// </summary>
         /// <param name="classIds"></param>
         /// <returns></returns>
-        public List<RB_Order_ViewModel> GetClassOrderPeopleNum(string classIds)
+        public List<RB_Order_ViewModel> GetClassOrderPeopleNumRepository(string classIds)
+        {
+            string sql = $@"
+SELECT ClassId, SUM(GuestNum) AS GuestNum 
+FROM rb_order 
+WHERE OrderState in (1,2) AND ClassId in ({classIds}) 
+GROUP BY ClassId;";
+            return Get<RB_Order_ViewModel>(sql).ToList();
+        }
+
+
+        #region 销售提成
+        /// <summary>
+        /// 查询所有款收齐的订单
+        /// </summary>
+        /// <param name="group_Id"></param>
+        /// <param name="eDate">开班时间</param>
+        /// <param name="courseIds">内部班课程</param>
+        /// <returns></returns>
+        public List<RB_Order_ViewModel> GetAllMoneyCollectedOrderList(int group_Id, string eDate,string courseIds)
         {
-            string sql = $@"SELECT ClassId, SUM(GuestNum) AS GuestNum FROM rb_order WHERE OrderState in (1,2) AND ClassId in ({classIds}) GROUP BY ClassId;";
+            string where = "";
+            if (!string.IsNullOrEmpty(courseIds))
+            {
+                where += $" and c.CouseId not in ({courseIds})";//排除内部班
+            }
+            string sql = $@"SELECT o.* FROM rb_order o 
+inner join rb_class c on o.ClassId = c.ClassId
+WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.CommissionRate >0 and c.OpenTime <= '{eDate} 23:59:59' {where} and o.PreferPrice <= (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) and (o.IsCommissionGiveOK =0 or (o.ExtraRewardMoney -o.ExtraDeductMoney)<> o.ExtraCommissionMoney);";
             return Get<RB_Order_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取销售 需补提成的订单数量
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="group_Id"></param>
+        /// <returns></returns>
+        public int GetUserLeaveOrderCommission(int userId, int group_Id)
+        {
+            string sql = $@"SELECT COUNT(0) FROM rb_order WHERE Group_Id ={group_Id} and OrderState =1 and (EnterID ={userId} or HelpEnterId ={userId} ) and CommissionBack >0";
+            var obj = ExecuteScalar(sql);
+            return obj != null ? Convert.ToInt32(obj) : 0;
+        }
+        #endregion
     }
 }

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -19,105 +19,61 @@ namespace Edu.Repository.Course
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetList(RB_Order_Guest_ViewModel demodel)
+        public List<RB_Order_Guest_ViewModel> GetOrderGuestListRepository(RB_Order_Guest_ViewModel demodel)
         {
-            string where = $@" 1=1 and Status=0";
+            string where = $@" 1=1 and A.Status=0 ";
             if (demodel.Group_Id > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
             }
             if (demodel.School_Id > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
             }
             if (demodel.Id > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
             }
             if (demodel.OrderId > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
             }
             if (demodel.ClassId > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
             }
             if (!string.IsNullOrEmpty(demodel.OrderIds))
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})";
             }
             if (!string.IsNullOrEmpty(demodel.ClassIds))
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} in({demodel.ClassIds})";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.ClassId)} in({demodel.ClassIds})";
             }
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
             }
             if (demodel.GuestState > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
             }
-
-            string sql = $@" select * from RB_Order_Guest where {where}";
-            return Get<RB_Order_Guest_ViewModel>(sql).ToList();
-        }
-
-
-
-        /// <summary>
-        /// 获取列表
-        /// </summary>
-        /// <param name="demodel"></param>
-        /// <param name="orderIds"></param>
-        /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetList_V2(RB_Order_Guest_ViewModel demodel)
-        {
-            string where = $@" ";
-            if (demodel.Group_Id > 0)
-            {
-                where += $@" and  a.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
-            }
-            if (demodel.School_Id > 0)
+            if (demodel.QEffectStatus == 1)
             {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
-            }
-            if (demodel.Id > 0)
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
-            }
-            if (demodel.OrderId > 0)
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
-            }
-            if (demodel.ClassId > 0)
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
-            }
-            if (!string.IsNullOrEmpty(demodel.OrderIds))
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})";
-            }
-            if (!string.IsNullOrEmpty(demodel.ClassIds))
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.ClassId)} in({demodel.ClassIds})";
-            }
-            if (!string.IsNullOrEmpty(demodel.GuestName))
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
-            }
-            if (demodel.GuestState > 0)
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
+                where += $@" AND (B.IsChaBan=0 OR (B.IsChaBan=1 AND B.EffectStatus IN(1) )) ";
             }
 
-            string sql = $@" SELECT A.* ,IFNULL(course.CourseName,'') AS CourseName,tOrder.CourseId,tOrder.OrderType,tOrder.StartClassHours,tOrder.IsChaBan
-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 {where}";
+            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
+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}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }
 
+ 
+
         /// <summary>
         /// 获取分页列表
         /// </summary>
@@ -127,11 +83,12 @@ WHERE 1=1 AND A.Status=0 {where}";
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
+        public List<RB_Order_Guest_ViewModel> GetOrderGuestPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
         {
             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
@@ -173,7 +130,7 @@ WHERE 1=1 AND A.Status=0
         /// </summary>
         /// <param name="demodel"></param>
         /// <returns></returns>
-        public int GetGuestNum(RB_Order_Guest_ViewModel demodel)
+        public int GetOrderGuestNumRepository(RB_Order_Guest_ViewModel demodel)
         {
             string where = $@" 1=1 and Status=0";
             if (demodel.Group_Id > 0)

Edu.Repository/Course/RB_Order_RemarkRepository.cs

@@ -19,26 +19,26 @@ namespace Edu.Repository.Course
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Remark_ViewModel> GetList(RB_Order_Remark_ViewModel demodel,string orderIds)
+        public List<RB_Order_Remark_ViewModel> GetOrderRemarkListRepository(RB_Order_Remark_ViewModel demodel)
         {
             string where = $@" 1=1";
-            
             if (demodel.OrderId > 0)
             {
                 where += $@" and r.{nameof(RB_Order_Remark.OrderId)} ={demodel.OrderId}";
             }
-            if (!string.IsNullOrEmpty(orderIds))
+            if (!string.IsNullOrEmpty(demodel.QOrderIds))
             {
-                where += $@" and r.{nameof(RB_Order_Remark.OrderId)} in({orderIds})";
+                where += $@" and r.{nameof(RB_Order_Remark.OrderId)} in({demodel.QOrderIds})";
             }
             if (demodel.Type > 0)
             {
                 where += $@" and r.{nameof(RB_Order_Remark.Type)} ={demodel.Type}";
             }
-
-            string sql = $@" select r.*,e.EmName as CreateByName from RB_Order_Remark r
-left join rb_employee e on r.CreateBy = e.EmployeeId 
-where {where} order by r.Id desc";
+            string sql = $@" 
+SELECT r.*,e.EmName as CreateByName 
+FROM RB_Order_Remark r left join rb_employee e on r.CreateBy = e.EmployeeId 
+WHERE {where} 
+ORDER BY r.Id DESC ";
             return Get<RB_Order_Remark_ViewModel>(sql).ToList();
         }
 
@@ -51,7 +51,7 @@ where {where} order by r.Id desc";
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Remark_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Remark_ViewModel demodel, string orderIds)
+        public List<RB_Order_Remark_ViewModel> GetOrderRemarkPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_Remark_ViewModel demodel)
         {
             string where = $@" 1=1";
 
@@ -59,9 +59,9 @@ where {where} order by r.Id desc";
             {
                 where += $@" and {nameof(RB_Order_Remark.OrderId)} ={demodel.OrderId}";
             }
-            if (!string.IsNullOrEmpty(orderIds))
+            if (!string.IsNullOrEmpty(demodel.QOrderIds))
             {
-                where += $@" and {nameof(RB_Order_Remark.OrderId)} in({orderIds})";
+                where += $@" and {nameof(RB_Order_Remark.OrderId)} in({demodel.QOrderIds})";
             }
             if (demodel.Type > 0)
             {

Edu.Repository/Course/RB_Sell_Commission_DeductionRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 销售提成抵扣仓储层
+    /// </summary>
+    public class RB_Sell_Commission_DeductionRepository : BaseRepository<RB_Sell_Commission_Deduction>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Deduction_ViewModel> GetList(RB_Sell_Commission_Deduction_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+            
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Deduction_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Deduction_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (demodel.SourceId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Deduction_ViewModel.SourceId)} ={demodel.SourceId}";
+            }
+            if (demodel.Type > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Deduction_ViewModel.Type)} ={demodel.Type}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Deduction_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+            if (!string.IsNullOrEmpty(demodel.SourceIds))
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Deduction_ViewModel.SourceId)} in({demodel.SourceIds})";
+            }
+
+
+            string sql = $@" select r.* from RB_Sell_Commission_Deduction r where {where} order by r.Id desc";
+            return Get<RB_Sell_Commission_Deduction_ViewModel>(sql).ToList();
+        }
+    }
+}

Edu.Repository/Course/RB_Sell_Commission_DetailsRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 销售提成期数明细仓储层
+    /// </summary>
+    public class RB_Sell_Commission_DetailsRepository : BaseRepository<RB_Sell_Commission_Details>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Details_ViewModel> GetList(RB_Sell_Commission_Details_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+            
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+
+
+            string sql = $@" select r.* from RB_Sell_Commission_Details r where {where} order by r.Id asc";
+            return Get<RB_Sell_Commission_Details_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Details_ViewModel> GetPageList(int pageIndex,int pageSize,out long count, RB_Sell_Commission_Details_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id >= 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.Depart_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.Depart_Id)} ={demodel.Depart_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+
+
+            string sql = $@" select r.* from RB_Sell_Commission_Details r where {where} order by r.Id desc";
+            return GetPage<RB_Sell_Commission_Details_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取用户提成列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Details_ViewModel> GetSellCommissionUserList(RB_Sell_Commission_Details_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id >= 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+
+
+            string sql = $@" select r.UserId,r.Depart_Id,r.School_Id,sum(r.StudentCount) as StudentCount,sum(r.CurrentPeriodMoney + r.DeductionMoney) as CurrentPeriodMoney,sum(r.CurrentExtraMoney + r.DeductionExtraMoney) as CurrentExtraMoney
+from RB_Sell_Commission_Details r where {where} group by r.UserId,r.Depart_Id,r.School_Id";
+            return Get<RB_Sell_Commission_Details_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取每期校区对应提成
+        /// </summary>
+        /// <param name="schoolId"></param>
+        /// <param name="periodsIds"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Details_ViewModel> GetSchoolCommission(int schoolId, string periodsIds)
+        {
+            string sql = $@"select PeriodId,SUM(CurrentPeriodMoney + CurrentExtraMoney + CurrentExtraMoney + DeductionExtraMoney) as CurrentPeriodMoney from rb_sell_commission_details 
+WHERE School_Id ={schoolId} and PeriodId in ({periodsIds})
+GROUP BY PeriodId ";
+
+            return Get<RB_Sell_Commission_Details_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 累计提成金额
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public decimal GetSellCommissionStatistics(RB_Sell_Commission_Details_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id >= 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.Depart_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.Depart_Id)} ={demodel.Depart_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+
+
+            string sql = $@" select sum(r.CurrentPeriodMoney + r.CurrentExtraMoney + r.DeductionMoney + r.DeductionExtraMoney) from RB_Sell_Commission_Details r where {where}";
+            var obj = ExecuteScalar(sql);
+            return obj == null ? 0 : Convert.ToDecimal(obj);
+        }
+    }
+}

Edu.Repository/Course/RB_Sell_Commission_PeriodsRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 销售提成期数仓储层
+    /// </summary>
+    public class RB_Sell_Commission_PeriodsRepository : BaseRepository<RB_Sell_Commission_Periods>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Periods_ViewModel> GetList(RB_Sell_Commission_Periods_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+            
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Periods_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Name))
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Periods_ViewModel.Name)} like '%{demodel.Name}%'";
+            }
+            if (!string.IsNullOrEmpty(demodel.Periods))
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Periods_ViewModel.Periods)} ='{demodel.Periods}'";
+            }
+
+            string sql = $@" select r.* from RB_Sell_Commission_Periods r where {where} order by r.Id desc";
+            return Get<RB_Sell_Commission_Periods_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Periods_ViewModel> GetPageList(int pageIndex,int pageSize,out long count,RB_Sell_Commission_Periods_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Periods_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Name))
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Periods_ViewModel.Name)} like '%{demodel.Name}%'";
+            }
+
+            string sql = $@" select r.* from RB_Sell_Commission_Periods r where {where} order by r.Id desc";
+            return GetPage<RB_Sell_Commission_Periods_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+    }
+}

Edu.Repository/Course/RB_Sell_Commission_RuleRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 销售提成规则仓储层
+    /// </summary>
+    public class RB_Sell_Commission_RuleRepository : BaseRepository<RB_Sell_Commission_Rule>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Rule_ViewModel> GetList(RB_Sell_Commission_Rule_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+            
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Rule_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+
+            string sql = $@" select r.* from RB_Sell_Commission_Rule r where {where} order by r.Id desc";
+            return Get<RB_Sell_Commission_Rule_ViewModel>(sql).ToList();
+        }
+
+    }
+}

Edu.Repository/Finance/RB_FinanceRepository.cs

@@ -109,6 +109,10 @@ namespace Edu.Repository.Finance
             {
                 where += string.Format(" AND A." + nameof(RB_Finance.ReFinanceId) + " ={0}", model.ReFinanceId);
             }
+            if (!string.IsNullOrEmpty(model.ReFinanceIds))
+            {
+                where += string.Format(" AND A." + nameof(RB_Finance.ReFinanceId) + " in({0})", model.ReFinanceIds);
+            }
             if (model.Status > 0)
             {
                 where += string.Format(" AND A." + nameof(RB_Finance.Status) + " ={0}", (int)model.Status);

Edu.Repository/Log/RB_Class_LogRepository.cs

@@ -35,10 +35,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Log_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Log_ViewModel.School_Id), query.School_Id);
-                }
+                //if (query.School_Id > 0)
+                //{
+                //    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Log_ViewModel.School_Id), query.School_Id);
+                //}
                 if (query.ClassId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Log_ViewModel.ClassId), query.ClassId);

Edu.Test/Program.cs

-using Edu.WebApi.Controllers.Course;
+
 using System;
 
 namespace Edu.Test
@@ -11,9 +11,6 @@ namespace Edu.Test
             filePath = @"C:/Users/qiaoyajun/Desktop/EduWordTemplate.doc";
             //filePath = @"C:/Users/qiaoyajun/Desktop/EduWordTemplate.doc";
             //var data = Common.Data.QuestionHelper.GetWordQuestionData(filePath);
-            var data2= new QuestionController().ImportWordQuestion(filePath, 1, 1);
-            Console.WriteLine(Common.Plugin.JsonHelper.Serialize(data2));
-            
         }
     }
 }

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -30,10 +30,6 @@ namespace Edu.WebApi.Controllers.Course
         /// 班级处理类对象
         /// </summary>
         private readonly ClassModule classModule = new ClassModule();
-        /// <summary>
-        /// 课程处理类对象
-        /// </summary>
-        private readonly CourseModule courseModule = AOP.AOPHelper.CreateAOPObject<CourseModule>();
 
         #region 教室管理
         /// <summary>
@@ -133,8 +129,8 @@ namespace Edu.WebApi.Controllers.Course
             {
                 extModel.RoomPicList = new List<string>();
             }
-            extModel.EndTime = extModel.EndTime ?? "21:30";
-            extModel.StartTime = extModel.StartTime ?? "09:30";
+            extModel.EndTime ??= "21:30";
+            extModel.StartTime ??= "09:30";
             return ApiResult.Success(data: extModel);
         }
 
@@ -459,7 +455,7 @@ namespace Edu.WebApi.Controllers.Course
             }
 
 
-            var orderGuestList = classModule.GetList_V2(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = classModel.ClassId });
+            var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = classModel.ClassId });
             var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = -1, ClassId = classModel.ClassId, StartDate = timeModel.NewPlanDateTime, EndDate = timeModel.NewPlanDateTime });
             foreach (var item in orderGuestList)
             {