新增实体类

Edu.Model/Entity/Bonus/RB_Personnel_Bonus.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Personnel_Bonus
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 类型(1-市场人员，2-课程顾问)
+		/// </summary>
+		public int RewardType { get; set; }
+
+		/// <summary>
+		/// 年份
+		/// </summary>
+		public int YearNum { get; set; }
+
+		/// <summary>
+		/// 月份编号
+		/// </summary>
+		public int MonthNum { get; set; }
+
+		/// <summary>
+		/// 员工编号
+		/// </summary>
+		public int EmployeeId { get; set; }
+
+		/// <summary>
+		/// 当月订单人数
+		/// </summary>
+		public int CurGuestNum { get; set; }
+
+		/// <summary>
+		/// 当月奖励金额
+		/// </summary>
+		public decimal CurRewardMoney { get; set; }
+
+		/// <summary>
+		/// 当月订单金额
+		/// </summary>
+		public decimal CurOrderMoney { get; set; }
+
+		/// <summary>
+		/// 抵扣人数
+		/// </summary>
+		public int DeductionNum { get; set; }
+
+		/// <summary>
+		/// 抵扣金额
+		/// </summary>
+		public decimal DeductionMoney { 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 int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 是否达成本月目标(1-是)
+		/// </summary>
+		public int IsReach { get; set; }
+	}
+}

Edu.Model/Entity/Bonus/RB_Personnel_BonusDetail.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Bonus
+{
+	/// <summary>
+	/// 员工人头奖励详情实体类
+	/// </summary>
+	[Serializable]
+	[DB(ConnectionName = "DefaultConnection")]
+	public class RB_Personnel_BonusDetail
+    {
+		/// <summary>
+		/// 奖励使用主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 奖励主表编号
+		/// </summary>
+		public int BonusId { get; set; }
+	}
+}

Edu.Model/Entity/Bonus/RB_Personnel_Deduction.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Bonus
+{
+	/// <summary>
+	/// 员工人头奖励抵扣详情实体类
+	/// </summary>
+	[Serializable]
+	[DB(ConnectionName = "DefaultConnection")]
+	public class RB_Personnel_Deduction
+    {
+		/// <summary>
+		/// 奖励抵扣编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 奖励主表编号
+		/// </summary>
+		public int BonusId { get; set; }
+
+		/// <summary>
+		/// 订单人数
+		/// </summary>
+		public int OrderGuestNum { get; set; }
+
+		/// <summary>
+		/// 订单金额
+		/// </summary>
+		public decimal OrderMoney { get; set; }
+	}
+}

Edu.Model/Entity/Sell/RB_Bonus_Plan.cs

@@ -18,6 +18,11 @@ namespace Edu.Model.Entity.Sell
 		/// </summary>
 		public int Id { get; set; }
 
+		/// <summary>
+		/// 方案类型(1-市场，2-课程顾问)
+		/// </summary>
+		public int PlanType { get; set; }
+
 		/// <summary>
 		/// 方案名称
 		/// </summary>

Edu.Model/ViewModel/Bonus/RB_Personnel_BonusDetail_Extend.cs

+using Edu.Model.Entity.Bonus;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励详情扩展实体类
+    /// </summary>
+    public class RB_Personnel_BonusDetail_Extend : RB_Personnel_BonusDetail
+    {
+    }
+}

Edu.Model/ViewModel/Bonus/RB_Personnel_Bonus_Extend.cs

+using Edu.Model.Entity.Bonus;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励扩展实体类
+    /// </summary>
+    public class RB_Personnel_Bonus_Extend : RB_Personnel_Bonus
+    {
+    }
+}

Edu.Model/ViewModel/Bonus/RB_Personnel_Deduction_Extend.cs

+using Edu.Model.Entity.Bonus;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励抵扣详情扩展实体类
+    /// </summary>
+    public class RB_Personnel_Deduction_Extend: RB_Personnel_Deduction
+    {
+
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Sell/RB_Bonus_PlanExtend.cs

@@ -15,5 +15,25 @@ namespace Edu.Model.ViewModel.Sell
         /// </summary>
         public List<RB_Bouns_PlanDetail_Extend> DetailList { get; set; }
 
+        /// <summary>
+        /// 类型字符串
+        /// </summary>
+        public string PlanTypeStr
+        {
+            get
+            {
+
+                string str = "";
+                if (this.PlanType == 1)
+                {
+                    str = "市场";
+                }
+                else if (this.PlanType == 2)
+                {
+                    str = "课程顾问";
+                }
+                return str;
+            }
+        }
     }
 }

Edu.Module.Course/BonusConfigModule.cs

@@ -62,6 +62,7 @@ namespace Edu.Module.Course
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
+                    {nameof(RB_Bonus_PlanExtend.PlanType),model.PlanType },
                     {nameof(RB_Bonus_PlanExtend.PlanName),model.PlanName },
                     {nameof(RB_Bonus_PlanExtend.BasicSalary),model.BasicSalary },
                     {nameof(RB_Bonus_PlanExtend.OpenBonus),model.OpenBonus },

Edu.Repository/Bonus/RB_Personnel_BonusDetailRepository.cs

+using Edu.Model.Entity.Bonus;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Repository.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励详情仓储层
+    /// </summary>
+    public class RB_Personnel_BonusDetailRepository : BaseRepository<RB_Personnel_BonusDetail>
+    {
+    }
+}

Edu.Repository/Bonus/RB_Personnel_BonusRepository.cs

+using Edu.Model.Entity.Bonus;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Repository.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励仓储层
+    /// </summary>
+    public class RB_Personnel_BonusRepository : BaseRepository<RB_Personnel_Bonus>
+    {
+
+    }
+}

Edu.Repository/Bonus/RB_Personnel_DeductionRepository.cs

+using Edu.Model.Entity.Bonus;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Repository.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励抵扣详情仓储层
+    /// </summary>
+    public class RB_Personnel_DeductionRepository : BaseRepository<RB_Personnel_Deduction>
+    {
+
+    }
+}

Edu.Repository/Sell/RB_Bonus_PlanRepository.cs

@@ -36,6 +36,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Bonus_PlanExtend.Group_Id), query.Group_Id);
                 }
+                if (query.PlanType > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Bonus_PlanExtend.PlanType), query.PlanType);
+                }
             }
             return GetPage<RB_Bonus_PlanExtend>(pageIndex,pageSize,out rowsCount,builder.ToString()).ToList();
         }
@@ -60,6 +64,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Bonus_PlanExtend.Group_Id), query.Group_Id);
                 }
+                if (query.PlanType > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Bonus_PlanExtend.PlanType), query.PlanType);
+                }
             }
             return Get<RB_Bonus_PlanExtend>(builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/Bonus/BonusController.cs

@@ -56,6 +56,8 @@ namespace Edu.WebApi.Controllers.Bonus
                     item.UseCourseIds,
                     item.NotUseCourseIds,
                     CreateByName,
+                    item.PlanType,
+                    item.PlanTypeStr,
                     CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
                 });
             }
@@ -74,6 +76,7 @@ namespace Edu.WebApi.Controllers.Bonus
             var query = new RB_Bonus_PlanExtend()
             {
                 Id = base.ParmJObj.GetInt("Id"),
+                PlanType=base.ParmJObj.GetInt("PlanType"),
                 PlanName = base.ParmJObj.GetStringValue("PlanName"),
                 BasicSalary = base.ParmJObj.GetDecimal("BasicSalary"),
                 OpenBonus = base.ParmJObj.GetDecimal("OpenBonus"),