页面修改

Edu.Module.Course/EmployeeBonusModule.cs

@@ -7,6 +7,8 @@ using System.Text;
 using System.Linq;
 using Edu.Model.Entity.Bonus;
 using Edu.Model.ViewModel.Bonus;
+using Edu.Common.Plugin;
+using VT.FW.DB;
 
 namespace Edu.Module.Course
 {
@@ -35,6 +37,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Personnel_BonusDetailRepository personnel_BonusDetailRepository = new RB_Personnel_BonusDetailRepository();
 
+        /// <summary>
+        /// 人头奖金日志仓储层对象
+        /// </summary>
+        private readonly RB_Personnel_BonusLogRepository personnel_BonusLogRepository = new RB_Personnel_BonusLogRepository();
+
         /// <summary>
         /// 订单仓储层对象
         /// </summary>
@@ -55,7 +62,9 @@ namespace Edu.Module.Course
         /// </summary>
         public void CreateEmployeeBonusModule(int GroupId)
         {
-            DateTime endTime = DateTime.Now.AddMonths(1).AddDays(-1);
+            DateTime d1 = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+            d1 = new DateTime(2021, 11, 1);
+            DateTime endTime = d1.AddMonths(1).AddDays(-1);
             int CurrentYear = endTime.Year;
             int CurrentMonth = endTime.Month;
             string endDate = Common.ConvertHelper.FormatDate(endTime);
@@ -70,12 +79,7 @@ namespace Edu.Module.Course
                 var saleList = Common.ConvertHelper.StringToList(item.SaleIds);
                 foreach (var saleId in saleList)
                 {
-                    bool isCalcReduce = true;
-                    if (StartYear == CurrentYear && StartMoneh == CurrentMonth)
-                    {
-                        isCalcReduce = false;
-                    }
-                    CalcPersionBonusModule(item, GroupId, endDate, saleId, CurrentYear, CurrentMonth, isCalcReduce: isCalcReduce);
+                    CalcPersionBonusModule(item, GroupId, endDate, saleId, CurrentYear, CurrentMonth);
                 }
             }
         }
@@ -90,19 +94,19 @@ namespace Edu.Module.Course
         /// <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 endDate, int saleId, int CurrentYear, int CurrentMonth, bool isCalcReduce = false)
         {
             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;
-            //计算抵扣
-            if (isCalcReduce)
+
+            //查询销售已发放的奖励
+            var saleBonusList = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
+            {
+                EmployeeId = saleId
+            });
+            if (saleBonusList != null && saleBonusList.Count > 0)
             {
-                //查询销售已发放的奖励
-                var saleBonusList = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
-                {
-                    EmployeeId = saleId
-                });
                 foreach (var bItem in saleBonusList)
                 {
                     //查询此月份的订单列表
@@ -111,23 +115,25 @@ namespace Edu.Module.Course
                     {
                         Dictionary<string, object> detailFileds = new Dictionary<string, object>();
                         detailFileds.Clear();
-
                         var tempCurMonthOrder = curMonthOrderList?.FirstOrDefault(qitem => qitem.OrderId == dItem.OrderId);
                         if (dItem.OrderState != (tempCurMonthOrder?.OrderState))
                         {
+                            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), tempCurMonthOrder.Income -tempCurMonthOrder.Refund-tempCurMonthOrder.PlatformTax);
-                            
+                            detailFileds.Add(nameof(RB_Personnel_BonusDetail_Extend.OrderMoney), newMoney);
+                            string _log1 = $"订单号【{dItem.OrderId}】的订单状态由:{dItem.OrderState.ToName()}=>{tempCurMonthOrder?.OrderState.ToName()}" +
+                                $"订单人数由:{dItem.OrderGuestNum}=>0,订单金额由:{dItem.OrderMoney}=>{newMoney}"
+                                ;
+                            personnel_BonusLogRepository.AddPersonnelBonusLogRepository(bItem.Id, 1, dItem.OrderId, _log1);
                         }
                         if (detailFileds != null && detailFileds.Count > 0)
-                        { 
-                           
+                        {
+                            personnel_BonusDetailRepository.Update(detailFileds, new WhereHelper(nameof(RB_Personnel_BonusDetail_Extend.Id), dItem.Id));
                         }
                     }
                 }
             }
-            //首月不计算抵扣
-            else 
+            else
             {
                 var pModel = new RB_Personnel_Bonus()
                 {
@@ -154,7 +160,7 @@ namespace Edu.Module.Course
                         Id = 0,
                         BonusId = pModel.Id,
                         OrderId = oItem.OrderId,
-                        OrderState=oItem.OrderState,
+                        OrderState = oItem.OrderState,
                         OrderMoney = oItem.Income - oItem.Refund - oItem.PlatformTax,
                         OrderGuestNum = oItem.GuestNum,
                     };

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -1207,7 +1207,7 @@ WHERE 1=1
             {
                 builder.AppendFormat(" AND ( EnterID={0} OR CreateBy={0} ) ", SaleId);
             }
-            builder.AppendFormat(" GROUP BY o.OrderId ");
+            builder.AppendFormat(" ORDER BY o.CreateTime ASC  ");
             return Get<RB_Order_ViewModel>(builder.ToString()).ToList();
         }
     }