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

Edu.Model/Entity/Bonus/RB_Personnel_Bonus.cs

@@ -16,11 +16,16 @@ namespace Edu.Model.Entity.Bonus
 		/// 主键编号
 		/// </summary>
 		public int Id { get; set; }
+		
+		/// <summary>
+		/// 关联方案编号
+		/// </summary>
+		public int PlanId { get; set; }
 
 		/// <summary>
 		/// 类型(1-市场人员，2-课程顾问)
 		/// </summary>
-		public int RewardType { get; set; }
+		public int PlanType { get; set; }
 
 		/// <summary>
 		/// 年份
@@ -52,15 +57,17 @@ namespace Edu.Model.Entity.Bonus
 		/// </summary>
 		public decimal CurOrderMoney { get; set; }
 
+
 		/// <summary>
-		/// 抵扣人数
+		/// 待抵扣金额
 		/// </summary>
-		public int DeductionNum { get; set; }
+		public decimal DeductionMoney { get; set; }
+
 
 		/// <summary>
-		/// 抵扣金额
+		/// 已完成抵扣金额
 		/// </summary>
-		public decimal DeductionMoney { get; set; }
+		public decimal FinishDeductionMoney { get; set; }
 
 		/// <summary>
 		/// 创建人
@@ -96,5 +103,30 @@ namespace Edu.Model.Entity.Bonus
 		/// 是否达成本月目标(1-是)
 		/// </summary>
 		public int IsReach { get; set; }
+
+		/// <summary>
+		/// 基本工资
+		/// </summary>
+		public decimal BasicSalary { get; set; }
+
+		/// <summary>
+		/// 开单奖金
+		/// </summary>
+		public decimal OpenBonus { get; set; }
+
+		/// <summary>
+		/// 工龄工资
+		/// </summary>
+		public decimal WorkAgeSalary { get; set; }
+
+		/// <summary>
+		/// 每5条线索奖金
+		/// </summary>
+		public decimal ClueNumSalary { get; set; }
+
+		/// <summary>
+		/// 以前月份的冲抵金额
+		/// </summary>
+		public decimal BeforeMoney { get; set; }
 	}
 }

Edu.Model/ViewModel/Bonus/RB_Personnel_Bonus_Extend.cs

@@ -14,5 +14,10 @@ namespace Edu.Model.ViewModel.Bonus
         /// 人头奖励详情列表
         /// </summary>
         public List<RB_Personnel_BonusDetail_Extend> DetailList { get; set; }
+        
+        /// <summary>
+        /// 是否查询未平账
+        /// </summary>
+        public int IsNoBalance { get; set; }
     }
 }

Edu.Model/ViewModel/User/Employee_ViewModel.cs

@@ -211,5 +211,6 @@ namespace Edu.Model.ViewModel.User
         /// 用户角色(1-市场人员，2-课程顾问)
         /// </summary>
         public UserRoleEnum UserRole { get; set; }
+
     }
 }

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -254,5 +254,10 @@ namespace Edu.Model.ViewModel.User
         /// 客户需求名称
         /// </summary>
         public string StuNeedsName { get; set; }
+
+        /// <summary>
+        /// 线索条数
+        /// </summary>
+        public int ClueCount { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Customer/CustomerModule.cs

 using Edu.Cache.User;
 using Edu.Common.Enum;
+using Edu.Common.Enum.Customer;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.Customer;
@@ -146,6 +147,9 @@ namespace Edu.Module.Customer
             else
             {
                 model.CustomerState = Common.Enum.Customer.CustomerStateEnum.Normal;
+                model.ApproveState = 1;
+                model.ApproveId = 1;
+                model.ApproveTime = DateTime.Now;
                 model.Password  = Common.DES.Encrypt(Common.Config.DefaultPwd);
                 var newId = customerRepository.Insert(model);
                 model.CustomerId = newId;
@@ -216,6 +220,7 @@ namespace Edu.Module.Customer
                   {nameof(RB_Customer_Extend.ApproveContent),model.ApproveContent},
                   {nameof(RB_Customer_Extend.ApproveId),model.ApproveId},
                   {nameof(RB_Customer_Extend.ApproveTime),model.ApproveTime},
+                  {nameof(RB_Customer_Extend.CustomerState),(int)CustomerStateEnum.Normal},
             };
             var flag = customerRepository.Update(fileds, new WhereHelper(nameof(RB_Customer_Extend.CustomerId), model.CustomerId));
             return flag;

Edu.Repository/Bonus/RB_Personnel_BonusRepository.cs

@@ -85,9 +85,13 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_Bonus_Extend.EmployeeId), query.EmployeeId);
                 }
-                if (query.RewardType > 0)
+                if (query.PlanType > 0)
                 {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_Bonus_Extend.RewardType), query.RewardType);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_Bonus_Extend.PlanType), query.PlanType);
+                }
+                if (query.IsNoBalance == 1)
+                {
+                    builder.AppendFormat(" AND A.DeductionMoney<>A.FinishDeductionMoney ");
                 }
             }
             var list= Get<RB_Personnel_Bonus_Extend>(builder.ToString()).ToList();

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -1182,7 +1182,7 @@ group by o.OrderId
         /// <param name="group_Id">集团编号</param>
         /// <param name="eDate">结束日期</param>
         /// <returns></returns>
-        public List<RB_Order_ViewModel> GetAllBonusOrderListRepository(int group_Id, string eDate,int SaleId)
+        public List<RB_Order_ViewModel> GetAllBonusOrderListRepository(int group_Id, string eDate,int PlanType,int SaleId)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
@@ -1193,6 +1193,7 @@ WHERE 1=1
             builder.AppendFormat(" AND o.OrderState IN({0},{1}) ", (int)OrderStateEnum.Normal, (int)OrderStateEnum.DropOut);
             builder.AppendFormat(" AND o.{0}={1} ", nameof(RB_Order_ViewModel.OrderType), (int)OrderTypeEnum.CourseOrder);
             builder.AppendFormat(" AND o.CreateTime >= '2021-11-01' ");
+            builder.AppendFormat(" AND o.OrderId NOT IN(SELECT B.OrderId FROM rb_personnel_bonus AS A INNER JOIN rb_personnel_bonusdetail AS B ON A.Id=B.BonusId WHERE A.PlanType={0} AND A.EmployeeId ={1}) ", PlanType, SaleId);
             //帐平
             builder.AppendFormat(" AND o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) ");
             if (group_Id > 0)

Edu.Repository/User/RB_AccountRepository.cs

@@ -469,7 +469,7 @@ FROM
 
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.WorkUserId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
+SELECT ar.AccountRemark,A.Id,A.Account,A.Password,A.AccountId,A.WorkUserId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
       ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType,A.Email,A.BaseHourFee,A.BaseHoursEnabled,A.EnableTime,IFNULL(A.DirectSupervisor,0) AS DirectSupervisor
       ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
       ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostId,0) AS Post_Id, IFNULL(p.PostName,'') AS PostName

Edu.Repository/User/RB_StudentRepository.cs

@@ -715,5 +715,22 @@ WHERE 1=1
             }
             return Get<RB_Student_ViewModel>(builder.ToString(), parameters)?.FirstOrDefault();
         }
+
+        /// <summary>
+        /// 线索统计
+        /// </summary>
+        /// <returns></returns>
+        public List<RB_Student_ViewModel> GetStudentStaticRepository(string createByIds,string startDate,string endDate)
+        {
+            StringBuilder builder = new StringBuilder();
+
+            builder.AppendFormat(@"
+ SELECT CreateBy,Count(1) AS ClueCount
+ FROM RB_Student 
+ WHERE Status=0 AND CreateBy IN({0}) and CreateTime>='{1}' and CreateTime<='{2} 23:59:59' 
+", createByIds, startDate, endDate);
+            var list = Get<RB_Student_ViewModel>(builder.ToString()).ToList();
+            return list;
+        }
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/Third/ThirdController.cs

@@ -34,6 +34,11 @@ namespace Edu.WebApi.Controllers.Third
         /// </summary>
         private readonly SellAchievementsModule sellAchievementsModule = new SellAchievementsModule();
 
+        /// <summary>
+        /// 员工人头奖励处理类
+        /// </summary>
+        private readonly EmployeeBonusModule employeeBonusModule = new EmployeeBonusModule();
+
         /// <summary>
         /// 根部部门层级获取部门主管
         /// </summary>
@@ -162,6 +167,7 @@ namespace Edu.WebApi.Controllers.Third
                 if (Refund > 0) {
                     //是退款 检验订单是否会影响 业绩提成
                     System.Threading.Tasks.Task.Run(() => sellAchievementsModule.ValidataAchievements(OrderId));
+                    System.Threading.Tasks.Task.Run(() => employeeBonusModule.ChangeEmployeeBonusModule(OrderId));
                 }
                 return ApiResult.Success();
             }

Edu.WebApi/Controllers/User/LoginController.cs

@@ -64,6 +64,17 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success();
         }
 
+
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult ChenageOrder()
+        {
+            var OrderId = base.ParmJObj.GetInt("OrderId");
+            employeeBonusModule.ChangeEmployeeBonusModule(OrderId);
+            return ApiResult.Success();
+        }
+
         /// <summary>
         /// 用户登录
         /// </summary>