页面修改

Edu.Model/Entity/Bonus/RB_Personnel_Bonus.cs

@@ -109,21 +109,11 @@ namespace Edu.Model.Entity.Bonus
 		/// </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>

Edu.Module.Course/EmployeeBonusModule.cs

@@ -81,7 +81,8 @@ namespace Edu.Module.Course
                 });
                 foreach (var item in list)
                 {
-                    item.SumPrice = bonusList?.Where(qitem => qitem.PeriodId == item.Id)?.Sum(qitem => qitem.CurRewardMoney)??0;
+                    item.SumPrice = bonusList?.Where(qitem => qitem.PeriodId == item.Id)
+                        ?.Sum(qitem => qitem.CurRewardMoney+qitem.ClueNumSalary+qitem.OpenBonus-qitem.BeforeMoney)??0;
                 }
             }
             return list;
@@ -226,18 +227,24 @@ namespace Edu.Module.Course
                                 var newMoney = tempCurMonthOrder.Income - tempCurMonthOrder.Refund - tempCurMonthOrder.PlatformTax;
                                 detailFileds.Add(nameof(RB_Personnel_BonusDetail_Extend.OrderGuestNum), 0);
                                 detailFileds.Add(nameof(RB_Personnel_BonusDetail_Extend.OrderMoney), newMoney);
+                                detailFileds.Add(nameof(RB_Personnel_BonusDetail_Extend.OrderState), orderModel.OrderState);
                                 string _log1 = $"订单号【{dItem.OrderId}】的订单状态由:{dItem.OrderState.ToName()}=>{tempCurMonthOrder?.OrderState.ToName()}" +
                                     $"订单人数由:{dItem.OrderGuestNum}=>0,订单金额由:{dItem.OrderMoney}=>{newMoney}"
                                     ;
                                 personnel_BonusLogRepository.AddPersonnelBonusLogRepository(sItem.Id, 1, dItem.OrderId, _log1);
                                 dItem.OrderGuestNum = 0;
                                 dItem.OrderMoney = newMoney;
+                                dItem.OrderState = orderModel.OrderState;
                             }
                             if (detailFileds != null && detailFileds.Count > 0)
                             {
                                 personnel_BonusDetailRepository.Update(detailFileds, new WhereHelper(nameof(RB_Personnel_BonusDetail_Extend.Id), dItem.Id));
                             }
                         }
+
+                        //当月有效订单数量
+                        bool isNormalOrder = sItem.DetailList.Where(qitem => qitem.OrderState == Common.Enum.Course.OrderStateEnum.Normal).Count() > 0;
+
                         var sumNum = sItem?.DetailList?.Sum(qitem => qitem.OrderGuestNum) ?? 0;
                         var sumOrderMoney = sItem?.DetailList?.Sum(qitem => qitem.OrderMoney);
                         var curRewardMoney = GetStepAwardAmount(planModel, sumNum);
@@ -250,9 +257,16 @@ namespace Edu.Module.Course
                         {
                             {nameof(RB_Personnel_Bonus.CurGuestNum),sumNum },
                             {nameof(RB_Personnel_Bonus.CurOrderMoney),sumOrderMoney },
-                            {nameof(RB_Personnel_Bonus.DeductionMoney),deductionMoney },
                             {nameof(RB_Personnel_Bonus.IsReach),(sumOrderMoney>planModel.MonthGoalMoney?1:0) },
                         };
+                        decimal newOpenBonus = 0;
+                        //当月有开单奖金且没有有效订单
+                        if (sItem.OpenBonus > 0 && !isNormalOrder)
+                        {
+                            newOpenBonus = sItem.OpenBonus;
+                            _bonusLog += $",开单奖金由：{sItem.OpenBonus}=>0";
+                        }
+                        bonusFileds.Add(nameof(RB_Personnel_Bonus.DeductionMoney), deductionMoney + newOpenBonus);
                         personnel_BonusRepository.Update(bonusFileds, new WhereHelper(nameof(RB_Personnel_Bonus.Id), sItem.Id));
                         personnel_BonusLogRepository.AddPersonnelBonusLogRepository(sItem.Id, 1, 0, _bonusLog);
                     }
@@ -304,13 +318,12 @@ namespace Edu.Module.Course
                 UpdateBy = 1,
                 UpdateTime = DateTime.Now,
                 DeductionMoney = DeductionMoney,
-                BasicSalary = item.BasicSalary,
                 OpenBonus = curNum > 0 ? item.OpenBonus : 0,
-                WorkAgeSalary = item.WorkAgeSalary,
                 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);
+            //当月总业绩
+            var totalMoney = (pModel.CurRewardMoney + pModel.OpenBonus  + pModel.ClueNumSalary);
             if (totalMoney >= chaE)
             {
                 pModel.BeforeMoney = chaE;
@@ -319,6 +332,8 @@ namespace Edu.Module.Course
             {
                 pModel.BeforeMoney = totalMoney;
             }
+            var newId = personnel_BonusRepository.Insert(pModel);
+            pModel.Id = newId;
             //写抵扣记录表信息
             if (pModel.BeforeMoney > 0)
             {
@@ -343,6 +358,8 @@ namespace Edu.Module.Course
                                 {nameof(RB_Personnel_Bonus_Extend.FinishDeductionMoney),(sItem?.FinishDeductionMoney??0)+sItem.DeductionMoney }
                             };
                             personnel_BonusRepository.Update(fileds, new WhereHelper(nameof(RB_Personnel_Bonus_Extend.Id), sItem.Id));
+                            string logContent = pModel.YearNum + "年" + pModel.MonthNum + "月,完成抵扣金额" + sItem.DeductionMoney;
+                            personnel_BonusLogRepository.AddPersonnelBonusLogRepository(sItem.Id, 1, 0, logContent);
                             tempChaE -= sItem.DeductionMoney;
                         }
                         else
@@ -361,13 +378,14 @@ namespace Edu.Module.Course
                                 {nameof(RB_Personnel_Bonus_Extend.FinishDeductionMoney),(sItem?.FinishDeductionMoney??0)+tempChaE }
                             };
                             personnel_BonusRepository.Update(fileds, new WhereHelper(nameof(RB_Personnel_Bonus_Extend.Id), sItem.Id));
+                            string logContent = pModel.YearNum + "年" + pModel.MonthNum + "月,抵扣金额" + tempChaE;
+                            personnel_BonusLogRepository.AddPersonnelBonusLogRepository(sItem.Id, 1, 0, logContent);
                             tempChaE = 0;
                         }
                     }
                 }
             }
-            var newId = personnel_BonusRepository.Insert(pModel);
-            pModel.Id = newId;
+           
             foreach (var oItem in allOrderList)
             {
                 var detailModel = new RB_Personnel_BonusDetail()

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -1196,7 +1196,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.CreateTime >= '2021-09-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) ");

Edu.WebApi/Controllers/Bonus/BonusController.cs

@@ -260,9 +260,7 @@ namespace Edu.WebApi.Controllers.Bonus
                     CreateTime=Common.ConvertHelper.FormatTime(item.CreateTime),
                     item.IsReach,
                     IsReachStr= item.IsReach==1?"已达标":"未达标",
-                    item.BasicSalary,
                     item.OpenBonus,
-                    item.WorkAgeSalary,
                     item.ClueNumSalary,
                     item.BeforeMoney,
                     item.DetailList,