页面修改

Edu.Model/Entity/Bonus/RB_Personnel_Bonus.cs

@@ -123,5 +123,10 @@ namespace Edu.Model.Entity.Bonus
 		/// 每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.Module.Course/EmployeeBonusModule.cs

@@ -56,23 +56,22 @@ namespace Edu.Module.Course
         /// <summary>
         /// 生成业绩
         /// </summary>
-        public void CreateEmployeeBonusModule(int GroupId,string startDate="")
+        public void CreateEmployeeBonusModule(int GroupId,string sDate="")
         {
             DateTime d1 = DateTime.Now;
-            if (!string.IsNullOrEmpty(startDate))
+            if (!string.IsNullOrEmpty(sDate))
             {
-                var tempDate = Convert.ToDateTime(startDate);
+                var tempDate = Convert.ToDateTime(sDate);
                 d1 = new DateTime(tempDate.Year, tempDate.Month, 1);
             }
             else
             {
                 d1 = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
             }
+            string startDate = Common.ConvertHelper.FormatDate(d1);
             DateTime endTime = d1.AddMonths(1).AddDays(-1);
-            
-            int CurrentYear = endTime.Year;
-            int CurrentMonth = endTime.Month;
             string endDate = Common.ConvertHelper.FormatDate(endTime);
+
             //人头配置列表
             var planList = bonus_PlanRepository.GetBounsPlanListRepository(new RB_Bonus_PlanExtend()
             {
@@ -84,7 +83,7 @@ namespace Edu.Module.Course
                 var saleList = Common.ConvertHelper.StringToList(item.SaleIds);
                 foreach (var saleId in saleList)
                 {
-                    CalcPersionBonusModule(item, GroupId, endDate, saleId, CurrentYear, CurrentMonth);
+                    CalcPersionBonusModule(item, GroupId, startDate, endDate, saleId);
                 }
             }
         }
@@ -168,17 +167,22 @@ namespace Edu.Module.Course
         /// <param name="GroupId"></param>
         /// <param name="endDate"></param>
         /// <param name="saleId"></param>
-        /// <param name="CurrentYear"></param>
-        /// <param name="CurrentMonth"></param>
-        /// <param name="isCalcReduce">true-计算抵扣,false-不计算</param>
-        private void CalcPersionBonusModule(RB_Bonus_PlanExtend item, int GroupId, string endDate, int saleId,int CurrentYear, int CurrentMonth, bool isCalcReduce = false)
+        private void CalcPersionBonusModule(RB_Bonus_PlanExtend item, int GroupId,string startDate,string endDate, int saleId)
         {
             var orderList = GetSaleOrderList(item, GroupId, endDate, saleId, out List<RB_Order_ViewModel> allOrderList);
-            var curNum = orderList?.Where(qitem => qitem.Year == CurrentYear && qitem.Month == CurrentMonth)?.Sum(qitem => qitem.GuestNum) ?? 0;
-            var curOrderMoney = orderList?.Where(qitem => qitem.Year == CurrentYear && qitem.Month == CurrentMonth)?.Sum(qitem => qitem.OrderMoney) ?? 0;
+            var curNum = orderList?.Sum(qitem => qitem.GuestNum) ?? 0;
+            var curOrderMoney = orderList?.Sum(qitem => qitem.OrderMoney) ?? 0;
+
+            //查询未平账的人员
+            var saleBonusList = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
+            {
+                EmployeeId = saleId,
+                PlanType=item.PlanType,
+                IsNoBalance=1,
+            });
+            var chaE = saleBonusList?.Sum(qitem => qitem.DeductionMoney - qitem.FinishDeductionMoney) ?? 0;
 
             decimal DeductionMoney = 0;
-            var startDate = Common.ConvertHelper.FormatDate(new DateTime(CurrentYear, CurrentMonth, 1));
             var stuModel= studentRepository.GetStudentStaticRepository(saleId.ToString(), startDate, endDate)?.FirstOrDefault();
             //新增当月的人头奖励
             var pModel = new RB_Personnel_Bonus()
@@ -186,8 +190,8 @@ namespace Edu.Module.Course
                 Id = 0,
                 PlanId = item.Id,
                 PlanType = item.PlanType,
-                YearNum = CurrentYear,
-                MonthNum = CurrentMonth,
+                YearNum = Convert.ToDateTime(startDate).Year,
+                MonthNum = Convert.ToDateTime(startDate).Month,
                 EmployeeId = saleId,
                 CurGuestNum = curNum,
                 CurOrderMoney = curOrderMoney,
@@ -204,10 +208,19 @@ namespace Edu.Module.Course
                 ClueNumSalary = stuModel?.ClueCount > 5 ? item.ClueNumSalary : 0
             };
             pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0;
+            var totalMoney = (pModel.BasicSalary + pModel.OpenBonus + pModel.WorkAgeSalary + pModel.ClueNumSalary);
+            if (totalMoney >= chaE)
+            {
+                pModel.BeforeMoney = chaE;
+            }
+            else 
+            {
+                pModel.BeforeMoney = totalMoney;
+            }
 
             var newId = personnel_BonusRepository.Insert(pModel);
             pModel.Id = newId;
-            foreach (var oItem in allOrderList.Where(qitem=>qitem.CreateTime.Year==CurrentYear&&qitem.CreateTime.Month==CurrentMonth))
+            foreach (var oItem in allOrderList)
             {
                 var detailModel = new RB_Personnel_BonusDetail()
                 {

Edu.Repository/Bonus/RB_Personnel_BonusRepository.cs

@@ -89,6 +89,10 @@ WHERE 1=1
                 {
                     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();
             if (list != null && list.Count > 0)

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>