提交代码

Edu.Common/Enum/Course/FinanceConfigTypeEnum.cs

@@ -80,6 +80,12 @@ namespace Edu.Common.Enum.Course
         /// 其他耗材出库
         /// </summary>
         [EnumField("其他耗材出库")]
-        OtherSuppliesStockOut = 13
+        OtherSuppliesStockOut = 13,
+
+        /// <summary>
+        /// 销售返佣批量生成财务单据
+        /// </summary>
+        [EnumField("销售返佣批量生成财务单据")]
+        SellCommission = 14
     }
 }

Edu.Model/Entity/Sell/RB_ReturnMoney_Batch.cs

@@ -43,5 +43,10 @@ namespace Edu.Model.Entity.Sell
         /// 1。返佣；2.幸福存折
         /// </summary>
         public int CommissionType { get; set; }
+
+        /// <summary>
+        /// 财务单据
+        /// </summary>
+        public string FinanceIds { get; set; }
     }
 }

Edu.Model/ViewModel/Sell/RB_Order_ReturnComission_ViewModel.cs

@@ -29,6 +29,17 @@ namespace Edu.Model.ViewModel.Sell
         /// </summary>
         public string UserName { get; set; }
 
+
+        /// <summary>
+        /// 用户部门
+        /// </summary>
+        public int UserDept { get; set; }
+
+        /// <summary>
+        /// 用户部门
+        /// </summary>
+        public string UserDeptName { get; set; }
+
         /// <summary>
         /// 返佣期数
         /// </summary>

Edu.Model/ViewModel/Sell/RB_ReturnMoney_Batch_ViewModel.cs

@@ -15,5 +15,31 @@ namespace Edu.Model.ViewModel.Sell
         /// 月份
         /// </summary>
         public string Month { get; set; }
+
+
+        /// <summary>
+        /// 个人直客期数总金额
+        /// </summary>
+        public decimal TotalEmployee { get; set; }
+
+
+        /// <summary>
+        /// 同业录入期数总金额
+        /// </summary>
+        public decimal TotalCustomer { get; set; }
+
+
+
+        /// <summary>
+        /// 内部介绍期数总金额
+        /// </summary>
+        public decimal TotalInternal { get; set; }
+
+
+
+        /// <summary>
+        /// 学员转介绍期数总金额
+        /// </summary>
+        public decimal TotalTrans { get; set; }
     }
 }

Edu.Module.Customer/CustomerCommissionModule.cs

@@ -179,6 +179,8 @@ namespace Edu.Module.Course
                     if (item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput || item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.InternalIntroduction)
                     {
                         var umodel = ulist.Where(x => x.Id == item.OrderSourceId).FirstOrDefault();
+                        item.UserDept = umodel.Dept_Id;
+                        item.UserDeptName = umodel.DeptName;
                         item.UserName = umodel.EmployeeName + (umodel.LeaveStatus == Common.Enum.User.LeaveStatusEnum.Departure ? "离职" : "");
                     }
                     else if (item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.CustomerInput)
@@ -280,5 +282,23 @@ namespace Edu.Module.Course
             };
         }
         #endregion
+
+
+        #region 更新返佣财务单据
+        /// <summary>
+        /// 更新返佣财务单据
+        /// </summary>
+        /// <param name="CustomerId"></param>
+        /// <returns></returns>
+        public bool UdateReturnMoneyModule(object FinanceIds,int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+              {nameof(RB_ReturnMoney_Batch.FinanceIds),FinanceIds},
+            };
+            var flag = returnMoney_BatchRepository.Update(fileds, new WhereHelper(nameof(RB_ReturnMoney_Batch.Id), Id));
+            return flag;
+        }
+        #endregion
     }
 }

Edu.Repository/Sell/RB_ReturnMoney_BatchRepository.cs

@@ -24,8 +24,20 @@ namespace Edu.Repository.Sell
         /// <returns></returns>
         public List<RB_ReturnMoney_Batch_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, int type, string month, int groupId)
         {
-            string sql = "select a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr";
-            sql += " from RB_ReturnMoney_Batch a";
+            string sql = $@"select IFNULL(SUM(b.CommissionMoeny),0) as TotalEmployee,IFNULL(SUM(c.CommissionMoeny),0) as TotalCustomer,a.FinanceIds,
+ IFNULL(SUM(d.CommissionMoeny),0) as TotalInternal,IFNULL(SUM(e.CommissionMoeny),0) as TotalTrans,  a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr";
+            sql += $@" from RB_ReturnMoney_Batch a  LEFT JOIN 
+ (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=1 and `Status` in(1,2) GROUP BY  OrderSourceType) as b
+ on a.Id=b.BatchId
+LEFT JOIN 
+ (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=2 and `Status` in(1,2) GROUP BY  OrderSourceType) as c
+ on a.Id=c.BatchId
+LEFT JOIN 
+ (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=3 and `Status` in(1,2) GROUP BY  OrderSourceType ) as d
+ on a.Id=d.BatchId
+LEFT JOIN 
+ (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=4 and `Status` in(1,2) GROUP BY  OrderSourceType ) as e
+ on a.Id=e.BatchId  ";
             sql += " where a.GroupId=@gid";
             DynamicParameters parameters = new DynamicParameters();
             parameters.Add("gid", groupId);

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -78,7 +78,7 @@ namespace Edu.WebApi.Controllers.Finance
                 {
                     return ApiResult.Success(result.message);
                 }
-                else 
+                else
                 {
                     return ApiResult.Failed(result.message);
                 }
@@ -111,7 +111,7 @@ namespace Edu.WebApi.Controllers.Finance
 
                 return ApiResult.Success("", pageModel);
             }
-            else 
+            else
             {
                 return ApiResult.Failed("请传入指定的返佣类型");
             }
@@ -160,10 +160,12 @@ namespace Edu.WebApi.Controllers.Finance
 
             //提成
             decimal SaleCommission = (orderList != null && orderList.Any()) ? orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney + x.ExtraCommissionMoney) : 0;//销售提成
-            if (orderList.Any()) {
+            if (orderList.Any())
+            {
                 string OrderIds = string.Join(",", orderList.Select(x => x.OrderId));
                 var achList = financeModule.GetAchListForOrderIds(OrderIds, base.UserInfo.Group_Id);
-                if (achList.Any()) {
+                if (achList.Any())
+                {
                     SaleCommission += achList.Sum(x => x.GiveOutMoney);// 业绩提成
                 }
             }
@@ -596,7 +598,7 @@ namespace Edu.WebApi.Controllers.Finance
 
             //查询月结老师的课时费
             var monthModel = financeModule.GetReserveClassHours(ReserveClassId, base.UserInfo.Group_Id);
-            
+
             var recultFiniceList = financeList.Select(x => new
             {
                 x.FrID,
@@ -688,7 +690,7 @@ namespace Edu.WebApi.Controllers.Finance
             string subtitle = "试听班级名称";
             string thirdTitle = "试听课程名称：";
             string fourTitle = "试听开班时间：";
- 
+
             List<RB_Finance_Extend> financeReciveList = financeList.Where(t => t.Type == WFTempLateClassEnum.IN).ToList();
             List<RB_Finance_Extend> financePayList = financeList.Where(t => t.Type == WFTempLateClassEnum.OUT).ToList();
 
@@ -726,7 +728,7 @@ namespace Edu.WebApi.Controllers.Finance
                         {
                             HAlignmentEnum= HAlignmentEnum.LEFT
                         },
-                         
+
                     }
                 };
                 slist.Add(firstRow);
@@ -1733,7 +1735,8 @@ namespace Edu.WebApi.Controllers.Finance
         /// <returns></returns>
         [AllowAnonymous]
         [HttpPost]
-        public ApiResult UpdateStudentValidClassHours() {
+        public ApiResult UpdateStudentValidClassHours()
+        {
             JObject jObj = JObject.Parse(RequestParm.Msg.ToString());
             int GuestId = jObj.GetInt("GuestId", 0);
             decimal Money = jObj.GetDecimal("Money");
@@ -2083,7 +2086,7 @@ namespace Edu.WebApi.Controllers.Finance
             string StartMonth = base.ParmJObj.GetStringValue("StartMonth");
             string EndMonth = base.ParmJObj.GetStringValue("EndMonth");
             string StudentName = base.ParmJObj.GetStringValue("StudentName");//学生名称
-            int StudentId = base.ParmJObj.GetInt("StudentId",0);//学员id
+            int StudentId = base.ParmJObj.GetInt("StudentId", 0);//学员id
             int OrderId = base.ParmJObj.GetInt("OrderId", 0);//订单
             string ContractNo = base.ParmJObj.GetStringValue("ContractNo");//合同编号
             if (string.IsNullOrEmpty(StartMonth))
@@ -2466,7 +2469,8 @@ namespace Edu.WebApi.Controllers.Finance
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetReceiptConfigInfo() {
+        public ApiResult GetReceiptConfigInfo()
+        {
             var userInfo = base.UserInfo;
 
             var model = financeModule.GetReceiptConfigInfo(userInfo);
@@ -2485,7 +2489,8 @@ namespace Edu.WebApi.Controllers.Finance
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetReceiptConfigInfo() {
+        public ApiResult SetReceiptConfigInfo()
+        {
             var userInfo = base.UserInfo;
             RB_Receipt_Config_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Config_ViewModel>(base.RequestParm.Msg.ToString());
             if (string.IsNullOrEmpty(demodel.TempleteIds))
@@ -2504,7 +2509,8 @@ namespace Edu.WebApi.Controllers.Finance
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed(msg);
             }
         }
@@ -2514,7 +2520,8 @@ namespace Edu.WebApi.Controllers.Finance
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetReceiptInfoPageList() {
+        public ApiResult GetReceiptInfoPageList()
+        {
             var userInfo = base.UserInfo;
             ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
             RB_Receipt_Info_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Info_ViewModel>(base.RequestParm.Msg.ToString());
@@ -2546,11 +2553,13 @@ namespace Edu.WebApi.Controllers.Finance
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetReceiptInfoForFinanceId() {
+        public ApiResult GetReceiptInfoForFinanceId()
+        {
             var userInfo = base.UserInfo;
             JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
             int FinanceId = parms.GetInt("FinanceId", 0);
-            if (FinanceId <= 0) {
+            if (FinanceId <= 0)
+            {
                 return ApiResult.ParamIsNull();
             }
 
@@ -2579,16 +2588,20 @@ namespace Edu.WebApi.Controllers.Finance
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetReceiptInfo() {
+        public ApiResult SetReceiptInfo()
+        {
             var userInfo = base.UserInfo;
             RB_Receipt_Info_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Info_ViewModel>(base.RequestParm.Msg.ToString());
-            if (demodel.FinanceId <= 0) {
+            if (demodel.FinanceId <= 0)
+            {
                 return ApiResult.ParamIsNull("请传递财务单据ID");
             }
-            if (string.IsNullOrEmpty(demodel.Remitter)) {
+            if (string.IsNullOrEmpty(demodel.Remitter))
+            {
                 return ApiResult.ParamIsNull("请传递汇款人");
             }
-            if (demodel.Money <= 0) {
+            if (demodel.Money <= 0)
+            {
                 return ApiResult.ParamIsNull("请传递收据金额");
             }
 
@@ -2607,7 +2620,8 @@ namespace Edu.WebApi.Controllers.Finance
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed(msg);
             }
         }
@@ -2617,11 +2631,13 @@ namespace Edu.WebApi.Controllers.Finance
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult DelReceiptInfo() {
+        public ApiResult DelReceiptInfo()
+        {
             var userInfo = base.UserInfo;
             JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
             int ReceiptId = parms.GetInt("ReceiptId", 0);
-            if (ReceiptId <= 0) {
+            if (ReceiptId <= 0)
+            {
                 return ApiResult.ParamIsNull();
             }
 
@@ -2630,10 +2646,14 @@ namespace Edu.WebApi.Controllers.Finance
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed(msg);
             }
         }
         #endregion
+
+
+       
     }
 }