1教育留学提成

Edu.Model/Entity/Finance/RB_Finance.cs

@@ -269,33 +269,7 @@ namespace Edu.Model.Entity.Finance
 
         private int? otherType = 0;
         /// <summary>
-        /// 其他来源类型  1追加团款  2单机票（2019-11-20 机票管理里  只有机票不绑团，其财务单据 需要在简易报表那边排除）
-        /// 3 平台   4 外交平台  （2019-12-05）ld 
-        /// 5 酒店折让单 2019-12-18 ld
-        /// 6 手配费收入 2019-12-30 ld
-        /// 7 预付款冲抵 2019-12-30 ld
-        /// 8 领队返款单据 2020-03-30 ld
-        /// 9 电商单据 2020-04-01 ld
-        /// 10 财务收据 2020-04-09 ld
-        /// 11 赞羊返佣 2020-06-09 ld
-        /// 12 赞羊已发货退货退款 2020-06-09 ld
-        /// 13 赞羊成本 2020-06-09 ld
-        /// 14 赞羊未发货退款 2020-06-09 ld
-        /// 15 电商采购 2020-07-07 ld
-        /// 16 电商出库 2020-07-09 ld
-        /// 17 电商报损/报溢单 2020-07-28 ld
-        /// 18 电商推荐返佣 2020-08-05 ld
-        /// 19 微店返佣 2020-08-05 ld
-        /// 20 直播返佣 2020-08-18 ld
-        /// 21 赞羊订单其他收入 2020-08-18 ld
-        /// 22 赞羊订单其他支出 2020-08-18 ld
-        /// 23 电商erp已发货退货退款 2020-09-15 ld
-        /// 24 电商erp未发货退款(制单就原路退款) 2020-09-15 ld
-        /// 25 和平甲鹤 已复制单据
-        /// 26 教育教师奖金单据
-        /// 27 教育教师绩效单据  2020-12-18 ld
-        /// 28 教育退课单据 2020-12-23  ld
-        /// 29 教育报价单-订单 2021-03-15  ld
+        /// 在旅游erp项目查看详情
         /// </summary>
         public int? OtherType { get => otherType; set => otherType = value; }
 

Edu.Model/Entity/Sell/RB_Order.cs

@@ -296,6 +296,16 @@ namespace Edu.Model.Entity.Sell
         /// </summary>
         public int VisitorReserveId { get; set; }
 
+        /// <summary>
+        /// 留学订单确认状态 1已确认
+        /// </summary>
+        public int LXConfirmState { get; set; }
+
+        /// <summary>
+        /// 确认人
+        /// </summary>
+        public int LXConfirmEmpId { get; set; }
+
         /// <summary>
         /// 留学确认时间（确认后 才能发提成  才进报表）
         /// </summary>

Edu.Model/Entity/Sell/RB_Sell_StudyAbroad_Details.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Sell
+{
+    /// <summary>
+    /// 销售提成明细实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Sell_StudyAbroad_Details
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 父级ID
+        /// </summary>
+        public int PeriodId { get; set; }
+
+        /// <summary>
+        /// 关联用户
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 留学项目id
+        /// </summary>
+        public int SourceId { get; set; }
+
+        /// <summary>
+        /// 订单ID
+        /// </summary>
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 提成总金额
+        /// </summary>
+        public decimal CommissionMoney { 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 Periods { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 报名人数
+        /// </summary>
+        public int StudentCount { get; set; }
+
+    }
+}

Edu.Model/Entity/Sell/RB_Sell_StudyAbroad_Periods.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Sell
+{
+    /// <summary>
+    /// 销售提成期数实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Sell_StudyAbroad_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; }
+
+        /// <summary>
+        /// 已发放人员的列表
+        /// </summary>
+        public string EmpIds { get; set; }
+
+    }
+}

Edu.Model/Entity/Sell/RB_Sell_StudyAbroad_Rule.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Sell
+{
+    /// <summary>
+    /// 销售提成规则实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Sell_StudyAbroad_Rule
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 类型  枚举列表
+        /// </summary>
+        public int OrderType { get; set; }
+
+        /// <summary>
+        /// 提成类型  1销售额   2利润
+        /// </summary>
+        public int CommissionType { get; set; }
+
+        /// <summary>
+        /// 提成比列
+        /// </summary>
+        public decimal CommissionRate { 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; }
+
+    }
+}

Edu.Model/ViewModel/Sell/RB_Sell_StudyAbroad_Details_ViewModel.cs

+using Edu.Model.Entity.Sell;
+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Sell
+{
+    /// <summary>
+    /// 销售提成期数明细实体类
+    /// </summary>
+    [Serializable]
+    public class RB_Sell_StudyAbroad_Details_ViewModel :  RB_Sell_StudyAbroad_Details
+    {
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 用户ids
+        /// </summary>
+        public string UserIds { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DeptName { get; set; }
+
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string SourceName { get; set; }
+
+        /// <summary>
+        /// 项目类型 1留学   2就业
+        /// </summary>
+        public int SourceType { get; set; }
+
+        /// <summary>
+        /// 订单ids
+        /// </summary>
+        public string OrderIds { get; set; }
+
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Sell/RB_Sell_StudyAbroad_Periods_ViewModel.cs

+using Edu.Model.Entity.Sell;
+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Sell
+{
+    /// <summary>
+    /// 销售提成期数实体类
+    /// </summary>
+    [Serializable]
+    public class RB_Sell_StudyAbroad_Periods_ViewModel :  RB_Sell_StudyAbroad_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/Sell/RB_Sell_StudyAbroad_Rule_ViewModel.cs

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

Edu.Module.Finance/FinanceModule.cs

@@ -327,7 +327,7 @@ namespace Edu.Module.Finance
             }
 
             //查询日期范围内所有的班级
-            var classList = classRepository.GetClassAndCourseListRepository(new RB_Class_ViewModel() { Group_Id = GroupId, StartTime = STime, EndTime = ETime }).ToList();
+            var classList = classRepository.GetClassAndCourseListRepository(new RB_Class_ViewModel() { Group_Id = GroupId, StartTime = STime, EndTime = ETime }).ToList();            
             List<RB_Order_ViewModel> orderAllList = new List<RB_Order_ViewModel>();
             List<RB_Finance_Extend> FAllList = new List<RB_Finance_Extend>();
             List<RB_Teaching_BonusDetail_ViewModel> teacherBonusList = new List<RB_Teaching_BonusDetail_ViewModel>();
@@ -526,7 +526,7 @@ namespace Edu.Module.Finance
                     demodel.QTShouRu = cfinanceList.Where(y => y.Is_Cashier == 1).Sum(x => x.Money ?? 0);
                     demodel.QTShouRu -= cfinanceList.Where(x => x.Is_Cashier == 1 && x.Fee > 0).GroupBy(x => new { x.FrID, x.Fee }).Sum(x => x.Key.Fee ?? 0);
                     //支出
-                    demodel.TiCheng = 0;//销售提成   -留学提成暂定
+                    demodel.TiCheng = (orderList != null && orderList.Any()) ? orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney + x.ExtraCommissionMoney) : 0;//销售提成   -留学提成暂定
                     demodel.ClassFee = 0;//老师提成   -留学暂定
                     demodel.JiXiaoMoney = 0;//绩效提成   -留学暂定
 
@@ -1390,8 +1390,8 @@ namespace Edu.Module.Finance
                         {
                             SourceIdArr.AddRange(lxOrderList.Select(x => x.SourceId).Distinct());
                         }
-                        //财务单据
-                        var lxFinanceList = RB_FinanceRepository.GetListForReportClass(new RB_Finance_Extend() { RB_Group_Id = GroupId, RB_Branch_Id = branchitem.SId, TCID = -2, sAduitDate = Convert.ToDateTime(startTime), eAduitDate = Convert.ToDateTime(endTime), FinanceType = 2, OrderSource = OrderResourceEnum.EducationStudy }, datebaseStr);
+                        //财务单据   付款单制单那月就统计进那月， 王姐的需求  因为这个是按照月份分摊的
+                        var lxFinanceList = RB_FinanceRepository.GetListForReportClass(new RB_Finance_Extend() { RB_Group_Id = GroupId, RB_Branch_Id = branchitem.SId, TCID = -3, sAduitDate = Convert.ToDateTime(startTime), eAduitDate = Convert.ToDateTime(endTime), FinanceType = 2, OrderSource = OrderResourceEnum.EducationStudy }, datebaseStr);
                         if (lxFinanceList.Any())
                         {
                             SourceIdArr.AddRange(lxFinanceList.Select(x => x.TCID ?? 0));
@@ -1425,11 +1425,11 @@ namespace Edu.Module.Finance
                             decimal QTShouRu = cfinanceList.Where(y => y.Is_Cashier == 1).Sum(x => x.Money ?? 0);
                             QTShouRu -= cfinanceList.Where(x => x.Is_Cashier == 1 && x.Fee > 0).GroupBy(x => new { x.FrID, x.Fee }).Sum(x => x.Key.Fee ?? 0);
                             //支出
-                            decimal TiCheng = 0;//销售提成   -留学提成暂定
+                            decimal TiCheng = (olist != null && olist.Any()) ? olist.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney + x.ExtraCommissionMoney) : 0;//销售提成   -留学提成暂定
                             decimal ClassFee = 0;//老师提成   -留学暂定
                             decimal JiXiaoMoney = 0;//绩效提成   -留学暂定
 
-                            var ofinanceList = lxflist.Where(x => x.OrderID == 0 && x.Type == WFTempLateClassEnum.OUT).ToList();
+                            var ofinanceList = lxflist.Where(x => (x.OrderID == 0 || (x.OrderID > 0 && x.OtherType == 45)) && x.Type == WFTempLateClassEnum.OUT).ToList();
                             decimal QTZhiChu = ofinanceList.Sum(x => x.Money ?? 0);
 
                             #endregion

Edu.Repository/Finance/RB_FinanceRepository.cs

@@ -296,11 +296,16 @@ LEFT JOIN rb_travel_finance_relation as E ON A.FinanceId=E.FinanceId where 1=1 "
             {
                 where.Append(" and IFNULL(E.TCID,0)=0");
             }
-            if (model.TCID == -2)
+            else if (model.TCID == -2)
             {
                 where.Append(" and IFNULL(E.TCID,0) >0");//班级上的单据
                 where.Append(" and IFNULL(b.OrderID,0) =0");
             }
+            else if (model.TCID == -3)
+            {
+                where.Append(" and IFNULL(E.TCID,0) >0");//班级上的单据
+                where.Append(" and (IFNULL(b.OrderID,0) =0 or (IFNULL(b.OrderID,0) >0 and b.OtherType =45))");
+            }
             if (model.RB_Branch_Id >= 0)
             {
                 where.Append(" AND c.School_Id =" + model.RB_Branch_Id);

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -645,6 +645,19 @@ WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.EffectStatus in(1,2) and
             return obj != null ? Convert.ToInt32(obj) : 0;
         }
 
+        /// <summary>
+        /// 获取可发放提成的留学订单列表
+        /// </summary>
+        /// <param name="group_Id"></param>
+        /// <param name="eDate"></param>
+        /// <returns></returns>
+        public List<RB_Order_ViewModel> GetAllCanSendStudyAbroadCommissionList(int group_Id, string eDate)
+        {
+            string sql = $@"SELECT * FROM rb_order WHERE Group_Id ={group_Id} and OrderType =2 and OrderState <>3 
+and LXConfirmState =1 and IFNULL(CommissionMoney,0) = -1 and LXConfirmDate <='{eDate} 23:59:59'";
+            return Get<RB_Order_ViewModel>(sql).ToList();
+        }
+
         #endregion
 
         #region 销售业绩统计

Edu.Repository/Sell/RB_Sell_StudyAbroad_DetailsRepository.cs

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

Edu.Repository/Sell/RB_Sell_StudyAbroad_PeriodsRepository.cs

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

Edu.Repository/Sell/RB_Sell_StudyAbroad_RuleRepository.cs

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

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -249,6 +249,7 @@ namespace Edu.WebApi.Controllers.Course
                         x.RenewOrderId,
                         x.FirstOrderId,
                         x.IsBackClass,
+                        x.LXConfirmState,
                         SplitDetailsList = x?.SplitDetailsList?.Select(qitem => new
                         {
                             qitem.S_ClassId,
@@ -1820,6 +1821,9 @@ namespace Edu.WebApi.Controllers.Course
                     x.OrderNature,
                     OrderNatureName = x.OrderNature.ToName(),
                     x.OldPreferPrice,
+                    x.LXConfirmState,
+                    x.LXConfirmDate,
+                    x.LXConfirmEmpId,
                     SaleRemarkList = x.SaleRemarkList.Select(z => new
                     {
                         z.Id,
@@ -1939,6 +1943,9 @@ namespace Edu.WebApi.Controllers.Course
                     x.OrderNature,
                     OrderNatureName = x.OrderNature.ToName(),
                     x.OldPreferPrice,
+                    x.LXConfirmDate,
+                    x.LXConfirmEmpId,
+                    x.LXConfirmState,
                     SaleRemarkList = x.SaleRemarkList.Select(z => new
                     {
                         z.Id,

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -97,12 +97,17 @@ namespace Edu.WebApi.Controllers.Finance
 
             //提成
             decimal SaleCommission = (orderList != null && orderList.Any()) ? orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney + x.ExtraCommissionMoney) : 0;//销售提成
-            var teacherProfitList = teachingRewardsModule.GetBonusDetailList(new RB_Teaching_BonusDetail_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
-            decimal TeacherProfitNow = (teacherProfitList != null && teacherProfitList.Any()) ? teacherProfitList.Sum(x => x.Money) : 0;//老师提成
 
-            var meritsProfitList = teachingRewardsModule.GetTeachingPerfList(new RB_Teaching_Perf_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
-            decimal MeritsProfit = (meritsProfitList != null && meritsProfitList.Any()) ? (meritsProfitList.Where(x => x.PerfState == Common.Enum.Course.PerfStateEnum.Confirmed).OrderByDescending(x => x.CreateTime).FirstOrDefault()?.Money ?? 0) : 0;//绩效提成
+            decimal TeacherProfitNow = 0, MeritsProfit = 0;
+            if (classId > 0)
+            {
+                //课时费  老师绩效
+                var teacherProfitList = teachingRewardsModule.GetBonusDetailList(new RB_Teaching_BonusDetail_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
+                TeacherProfitNow = (teacherProfitList != null && teacherProfitList.Any()) ? teacherProfitList.Sum(x => x.Money) : 0;//老师提成
 
+                var meritsProfitList = teachingRewardsModule.GetTeachingPerfList(new RB_Teaching_Perf_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
+                MeritsProfit = (meritsProfitList != null && meritsProfitList.Any()) ? (meritsProfitList.Where(x => x.PerfState == Common.Enum.Course.PerfStateEnum.Confirmed).OrderByDescending(x => x.CreateTime).FirstOrDefault()?.Money ?? 0) : 0;//绩效提成
+            }
             PayReceive += (SaleCommission + TeacherProfitNow + MeritsProfit);//支出加上提成的
             PayActual += (SaleCommission + TeacherProfitNow + MeritsProfit);