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

Edu.Model/Entity/Sell/RB_Order.cs

@@ -440,5 +440,10 @@ namespace Edu.Model.Entity.Sell
         /// 滚动开班所属校区
         /// </summary>
         public int ScrollSchoolId { get; set; }
+
+        /// <summary>
+        /// 留学订单返佣金额
+        /// </summary>
+        public decimal StudyBroadRebateMoney { get; set; }
     }
 }

Edu.Module.Course/OrderModule.cs

@@ -3805,6 +3805,52 @@ namespace Edu.Module.Course
             }
             return flag;
         }
+
+        /// <summary>
+        /// 财务 更新留学订单返佣信息
+        /// </summary>
+        /// <param name="order"></param>
+        /// <param name="empModel"></param>
+        /// <returns></returns>
+        public bool UpdateStudyOrderInfo(RB_Order_ViewModel order, Employee_ViewModel empModel)
+        {
+            var orderModel = orderRepository.GetEntity(order.OrderId);
+            if (orderModel == null) { return false; }
+ 
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() { };
+            string LogContent="";
+            if (order.StudyBroadRebateMoney >= 0)
+            {
+                keyValues.Add(nameof(RB_Order_ViewModel.StudyBroadRebateMoney), order.StudyBroadRebateMoney);
+                LogContent = $"更新留学订单返佣【{orderModel.StudyBroadRebateMoney}】=>【{order.StudyBroadRebateMoney}】";
+            }
+            List<WhereHelper> wheres = new List<WhereHelper>()
+            {
+                new WhereHelper()
+                {
+                     FiledName=nameof(RB_Order_ViewModel.OrderId),
+                     FiledValue=order.OrderId,
+                     OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            bool flag = orderRepository.Update(keyValues, wheres);
+            if (flag)
+            {
+                //写入日志
+                changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
+                {
+                    Id = 0,
+                    Type = 2,
+                    CreateBy = empModel.Id,
+                    CreateTime = DateTime.Now,
+                    Group_Id = empModel.Group_Id,
+                    LogContent = $"【{empModel.EmployeeName}({empModel.Id})】单据审核通过{LogContent}",
+                    School_Id = empModel.School_Id,
+                    SourceId = order.OrderId
+                });
+            }
+            return flag;
+        }
         #endregion
 
         #region 财务统计

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1668,7 +1668,8 @@ namespace Edu.WebApi.Controllers.Course
                     x.CreateType,
                     CreateTypeName = x.CreateType.ToName(),
                     x.StuSourceIdName,
-                    x.BrokerageMoney
+                    x.BrokerageMoney,
+                    x.StudyBroadRebateMoney,
                 })
             };
             pageModel.PageData = obj;
@@ -1868,7 +1869,8 @@ namespace Edu.WebApi.Controllers.Course
                     x.CreateType,
                     CreateTypeName = x.CreateType.ToName(),
                     x.StuSourceIdName,
-                    x.BrokerageMoney
+                    x.BrokerageMoney,
+                    x.StudyBroadRebateMoney,
                 })
             };
             pageModel.PageData = obj;
@@ -2187,6 +2189,7 @@ namespace Edu.WebApi.Controllers.Course
                         z.GuestName,
                         z.GuestState
                     }),
+                    x.StudyBroadRebateMoney
                 })
             };
             return ApiResult.Success("", pageModel);
@@ -2317,7 +2320,8 @@ namespace Edu.WebApi.Controllers.Course
                         z.Id,
                         z.GuestName,
                         z.GuestState
-                    })
+                    }),
+                    x.StudyBroadRebateMoney,
                 })
             };
             return ApiResult.Success("", pageModel);

Edu.WebApi/Controllers/Third/ThirdController.cs

 using Edu.Common.API;
 using Edu.Common.Plugin;
+using Edu.Model.ViewModel.Sell;
 using Edu.Module.Course;
 using Edu.Module.User;
 using Edu.WebApi.Filter;
@@ -142,7 +143,8 @@ namespace Edu.WebApi.Controllers.Third
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        public ApiResult GetDepartmentManager() {
+        public ApiResult GetDepartmentManager()
+        {
             JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
             int DeptId = jobj.GetInt("DeptId", 0);
             if (DeptId <= 0)
@@ -151,7 +153,8 @@ namespace Edu.WebApi.Controllers.Third
             }
             var dmodel = departmentModule.GetDepartmentModule(DeptId);
             string ManagerIds = "";
-            if (dmodel != null) {
+            if (dmodel != null)
+            {
                 ManagerIds = dmodel.ManagerIds ?? "";
             }
             var RList = new object();
@@ -212,7 +215,8 @@ namespace Edu.WebApi.Controllers.Third
             bool flag = orderModule.UpdateEduOrderIncome(OrderId, Income, PlatformTax, Refund, empModel);
             if (flag)
             {
-                if (Refund > 0) {
+                if (Refund > 0)
+                {
                     //是退款 检验订单是否会影响 业绩提成
                     System.Threading.Tasks.Task.Run(() => sellAchievementsModule.ValidataAchievements(OrderId));
                     System.Threading.Tasks.Task.Run(() => employeeBonusModule.ChangeEmployeeBonusModule(OrderId));
@@ -224,5 +228,43 @@ namespace Edu.WebApi.Controllers.Third
                 return ApiResult.Failed();
             }
         }
+
+
+        /// <summary>
+        /// 更新留学订单返佣金额
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult UpdateStudyOrderInfo()
+        {
+            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
+            int EmployeeId = parms.GetInt("EmployeeId", 0);
+            int OrderId = parms.GetInt("OrderId", 0);
+            decimal StudyBroadRebateMoney = parms.GetDecimal("Income");
+            decimal Fee = parms.GetDecimal("PlatformTax");
+ 
+            if (EmployeeId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递用户id");
+            }
+            if (OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递订单id");
+            }
+            var empModel = employeeModule.GetEmployeeListModule(new Model.ViewModel.User.Employee_ViewModel() { Id = EmployeeId })?.FirstOrDefault();
+            if (empModel == null)
+            {
+                return ApiResult.ParamIsNull(message: "当前员工编号不存在!");
+            }
+            var orderInfo = new RB_Order_ViewModel()
+            {
+                OrderId=OrderId,
+                StudyBroadRebateMoney= StudyBroadRebateMoney-Fee
+            };
+            bool flag = orderModule.UpdateStudyOrderInfo(orderInfo,empModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
     }
 }

Edu.WebApi/Startup.cs

@@ -87,7 +87,6 @@ namespace Edu.WebApi
             services.AddSenparcGlobalServices(Configuration)//Senparc.CO2NET 全局注册
             .AddSenparcWeixinServices(Configuration);
             //配置后台任务
-            //services.AddTransient(typeof(Microsoft.Extensions.Hosting.IHostedService), typeof(EmailBackgroundService));
             services.AddHostedService<TimedTaskServices>();
         }