1

Edu.Model/ViewModel/Finance/RB_Finance_Extend.cs

@@ -45,6 +45,11 @@ namespace Edu.Model.ViewModel.Finance
         /// </summary>
         public int? IsSelectNormal { get; set; }
 
+        /// <summary>
+        /// 查询教育单据 1是
+        /// </summary>
+        public int IsSelectEdu { get; set; }
+
         /// <summary>
         /// 查询订单相关单据
         /// </summary>

Edu.Module.Course/ClassModule.cs

@@ -5963,5 +5963,14 @@ namespace Edu.Module.Course
 
             //11
         }
+
+        /// <summary>
+        /// 获取课程信息
+        /// </summary>
+        /// <param name="courserId"></param>
+        /// <returns></returns>
+        public RB_Course_ViewModel GetCourseInfo(int courserId) {
+            return courseRepository.GetEntity<RB_Course_ViewModel>(courserId);
+        }
     }
 }
\ No newline at end of file

Edu.Module.Finance/FinanceModule.cs

@@ -127,6 +127,10 @@ namespace Edu.Module.Finance
         /// </summary>
         private readonly RB_Sell_Achievements_EmpRepository sell_Achievements_EmpRepository = new RB_Sell_Achievements_EmpRepository();
         /// <summary>
+        /// 订单返佣
+        /// </summary>
+        private readonly RB_Order_ReturnComissionRepository order_ReturnComissionRepository = new RB_Order_ReturnComissionRepository();
+        /// <summary>
         /// 学校仓储层对象
         /// </summary>
         private readonly RB_SchoolRepository schoolRepository = new RB_SchoolRepository();
@@ -2932,6 +2936,17 @@ namespace Edu.Module.Finance
             return sell_Achievements_EmpRepository.GetList(new RB_Sell_Achievements_Emp_ViewModel() { Group_Id = group_Id, OrderIds = orderIds });
         }
 
+        /// <summary>
+        /// 获取订单返佣列表
+        /// </summary>
+        /// <param name="orderIds"></param>
+        /// <param name="group_Id"></param>
+        /// <returns></returns>
+        public List<RB_Order_ReturnComission_ViewModel> GetOrderReturnComissionList(string orderIds, int group_Id)
+        {
+            return order_ReturnComissionRepository.GetOrderReturnComissionListRepositpry(new RB_Order_ReturnComission_ViewModel() { QOrderIds = orderIds, GroupId = group_Id });
+        }
+
         #endregion
 
         #region 月结窗口

Edu.Repository/Bonus/RB_Personnel_BonusRepository.cs

@@ -135,5 +135,17 @@ WHERE 1=1
             string sql = string.Format(@" UPDATE RB_Personnel_Bonus SET IsIssue=1 WHERE Id IN({0})", Ids);
             return base.Execute(sql) > 0;   
         }
+
+        /// <summary>
+        /// 获取员工人头奖励统计
+        /// </summary>
+        /// <returns></returns>
+        public List<RB_Personnel_Bonus_Extend> GetPersonnelBonusForMonth(List<string> monthList,int groupId) {
+            string sql = $@"SELECT p.Periods as QPeriodIds,b.EmployeeId,SUM(b.CurRewardMoney + b.OpenBonus) as OpenBonus FROM rb_personnel_bonus b
+INNER JOIN rb_personnel_period p on b.PeriodId = p.Id
+WHERE b.Group_Id ={groupId} and p.Periods in({string.Join(",", monthList)}) and (b.CurRewardMoney + b.OpenBonus)>0
+GROUP BY p.Periods,b.EmployeeId";
+            return Get<RB_Personnel_Bonus_Extend>(sql).ToList();
+        }
     }
 }
\ No newline at end of file

Edu.Repository/Finance/RB_FinanceRepository.cs

@@ -141,6 +141,11 @@ namespace Edu.Repository.Finance
             {
                 where += string.Format(" AND A." + nameof(RB_Finance.Status) + " in(1,2,5)");
             }
+            if (model.IsSelectEdu == 1)
+            {
+                where += string.Format(" AND A." + nameof(RB_Finance.SourceID) + " in(17,18)");
+            }
+
             string sql = string.Format(@"SELECT A.*  FROM {0} AS A WHERE {2} {3}", TableName, ReCordTableName, where, " GROUP BY A.FrID DESC");
             return Get<RB_Finance_Extend>(sql).ToList();
         }

Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs

@@ -393,8 +393,19 @@ WHERE 1=1
             return list;
         }
 
-
-
+        /// <summary>
+        /// 获取订单返佣统计
+        /// </summary>
+        /// <param name="monthList"></param>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public List<RB_Order_ReturnComission_ViewModel> GetOrderReturnComissionForMonth(List<string> monthList, int groupId) {
+            string sql = $@"SELECT b.BatchName,r.OrderSourceId,SUM(r.CommissionMoeny)as CommissionMoeny FROM rb_order_returncomission r 
+INNER JOIN rb_returnmoney_batch b on r.BatchId = b.Id
+WHERE r.GroupId ={groupId} and r.OrderSourceType in(1,3) and r.CommissionType =1 and b.BatchName in({string.Join(",", monthList)}) and r.CommissionMoeny >0
+GROUP BY b.BatchName,r.OrderSourceId";
+            return Get<RB_Order_ReturnComission_ViewModel>(sql).ToList();
+        }
 
         /// <summary>
         /// 获取用户返佣列表

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -2491,5 +2491,7 @@ namespace Edu.WebApi.Controllers.Course
             return ApiResult.Success(data: list);
         }
         #endregion
+
+        
     }
 }

Edu.WebApi/Controllers/Course/SellAchievementsController.cs

@@ -761,7 +761,7 @@ namespace Edu.WebApi.Controllers.Course
 
             try
             {
-                List<ExcelDataSource> list = sellAchievementsModule.GetSellAchievementsRankStatToExcel(StartMonth, EndMonth, UserInfo.Group_Id);
+                List<ExcelDataSource> list = sellAchievementsModule.GetSellAchievementsRankStat_NewToExcel(StartMonth, EndMonth, UserInfo.Group_Id);
                 slist.AddRange(list);
 
                 var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
@@ -774,6 +774,69 @@ namespace Edu.WebApi.Controllers.Course
                 return File(byteData1, "application/octet-stream", ExcelName);
             }
         }
+
+
+        /// <summary>
+        /// 获取业绩排名统计_New
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSellAchievementsRankStat_New()
+        {
+            string StartMonth = ParmJObj.GetStringValue("StartMonth");
+            string EndMonth = ParmJObj.GetStringValue("EndMonth");
+            if (string.IsNullOrEmpty(StartMonth) || string.IsNullOrEmpty(EndMonth))
+            {
+                return ApiResult.ParamIsNull();
+            }
+            try
+            {
+                StartMonth = Convert.ToDateTime(StartMonth).ToString("yyyy-MM");
+                EndMonth = Convert.ToDateTime(EndMonth).ToString("yyyy-MM");
+            }
+            catch (Exception)
+            {
+                return ApiResult.Failed("日期格式有误");
+            }
+            if (Convert.ToDateTime(StartMonth) > Convert.ToDateTime(EndMonth))
+            {
+                return ApiResult.Failed("开始日期不能大于结束日期");
+            }
+
+            var list = sellAchievementsModule.GetSellAchievementsRankStat_New(StartMonth, EndMonth, UserInfo.Group_Id);
+            return ApiResult.Success("", list);
+        }
+
+        /// <summary>
+        /// 获取业绩排名统计_New
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSellAchievementsRankStat_NewV2()
+        {
+            string StartMonth = ParmJObj.GetStringValue("StartMonth");
+            string EndMonth = ParmJObj.GetStringValue("EndMonth");
+            if (string.IsNullOrEmpty(StartMonth) || string.IsNullOrEmpty(EndMonth))
+            {
+                return ApiResult.ParamIsNull();
+            }
+            try
+            {
+                StartMonth = Convert.ToDateTime(StartMonth).ToString("yyyy-MM");
+                EndMonth = Convert.ToDateTime(EndMonth).ToString("yyyy-MM");
+            }
+            catch (Exception)
+            {
+                return ApiResult.Failed("日期格式有误");
+            }
+            if (Convert.ToDateTime(StartMonth) > Convert.ToDateTime(EndMonth))
+            {
+                return ApiResult.Failed("开始日期不能大于结束日期");
+            }
+
+            var list = sellAchievementsModule.GetSellAchievementsRankStat_NewV2(StartMonth, EndMonth, UserInfo.Group_Id);
+            return ApiResult.Success("", list);
+        }
         #endregion
     }
 }

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -2674,7 +2674,6 @@ namespace Edu.WebApi.Controllers.Finance
         }
         #endregion
 
-
         #region 财务收款手续费
 
         /// <summary>
@@ -2688,5 +2687,84 @@ namespace Edu.WebApi.Controllers.Finance
         }
 
         #endregion
+
+
+        #region 约课单订单核算
+
+        /// <summary>
+        /// 获取订单核算界面
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetOrderSettlementInfo()
+        {
+            int OrderId = ParmJObj.GetInt("OrderId", 0);
+            if (OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            var orderModel = orderModule.GetClassOrderInfoModule(OrderId);
+            if (orderModel == null) { return ApiResult.Failed("订单不存在"); }
+
+            string CourseName = "";
+            if (orderModel.OrderType == Common.Enum.Sale.OrderTypeEnum.CourseOrder)
+            {
+                CourseName = classModule.GetCourseInfo(orderModel.CourseId)?.CourseName ?? "";
+            }
+            else if (orderModel.OrderType == Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder)
+            {
+                CourseName = studyAbroadModule.GetStudyAbroadModule(orderModel.SourceId)?.Name ?? "";
+            }
+
+            //查询订单下所有的 财务单据
+            RB_Finance_Extend model = new RB_Finance_Extend() { RB_Group_Id = UserInfo.Group_Id, FinanceType = 2, IsSelectEdu = 1, OrderID = OrderId };
+            var financeList = financeModule.GetFinanceInfoList(model);
+
+            //查询订单下 业绩(老提成) + 返佣 
+            //提成
+            decimal SaleCommission = orderModel.IsCommissionGive == 1 ? orderModel.CommissionMoney + orderModel.ExtraCommissionMoney : 0;//销售提成
+
+            var achList = financeModule.GetAchListForOrderIds(OrderId.ToString(), base.UserInfo.Group_Id);
+            if (achList.Any())
+            {
+                SaleCommission += achList.Sum(x => x.GiveOutMoney);// 业绩提成
+            }
+
+            var ReturnList = financeModule.GetOrderReturnComissionList(OrderId.ToString(), UserInfo.Group_Id);
+
+            decimal ReturnMoney = ReturnList.Sum(x => x.CommissionMoeny);
+
+
+            var recultFiniceList = financeList.Select(x => new
+            {
+                x.FrID,
+                x.Type,
+                x.TCID,
+                x.OrderID,
+                x.Money,
+                x.PayMoney,
+                AirTotalMoney = x.AirTotalMoney ?? 0,
+                AirTotalPayMoney = x.AirTotalPayMoney ?? 0,
+                CostTypeList = x.CostTypeList.Distinct().ToList(),
+                x.OrderSource,
+                AuditList = x.AuditList.Select(t => new { t.AuditEmId, t.AuditEmName, AuditDate = t.AuditDate.HasValue ? t.AuditDate.Value.ToString("yyyy/MM/dd") : "" }),
+                StatusStr = EnumHelper.ToName(x.Status.Value),
+                x.RB_CreateByName,
+                CreateDate = x.CreateDate.Value.ToString("yyyy-MM-dd"),
+                TradeDate = x.TradeDate.HasValue ? x.TradeDate.Value.ToString("yyyy-MM-dd") : "",
+                TradeWayList = x.BankList?.Select(y => new { y.AccountType, y.Alias, y.BankNo, TypeName = EnumHelper.ToName(y.Type), y.CurrencyName, y.OriginalMoney, y.Money, y.Rate })
+            });
+
+            return ApiResult.Success("", new
+            {
+                orderModel.OrderId,
+                orderModel.OrderType,
+
+                FinanceList = recultFiniceList
+            });
+        }
+
+        #endregion
     }
 }