1

Edu.Module.Course/SellAchievementsModule.cs

@@ -22,6 +22,7 @@ using Edu.Repository.Log;
 using Edu.Repository.Sell;
 using Edu.Repository.StudyAbroad;
 using Edu.Repository.User;
+using MongoDB.Driver;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -873,6 +874,24 @@ namespace Edu.Module.Course
                 orderList = orderList.Where(x => cbdOrderlist.Contains(x.OrderId)).ToList();//都是已返佣的
                 #endregion
 
+                #region 反查续费订单的首单市场人员
+                //暂时 所有续费  都算人头奖励   （09.02  跟 张艳确认 所有续费都算市场人头）
+                if (orderList.Where(x => x.JoinType == Common.Enum.Sale.OrderJoinTypeEnum.RenewOrder && x.Refund <= 0).Any())
+                {
+                    var xfOrderList = orderList.Where(x => x.JoinType == Common.Enum.Sale.OrderJoinTypeEnum.RenewOrder && x.Refund <= 0).ToList();
+                    string xforderIds = string.Join(",", xfOrderList);
+                    var xfStuList = orderRepository.GetXFOrderFirstEnterList(userInfo.Group_Id, xforderIds);
+
+                    foreach (var item in xfOrderList)
+                    {
+                        int stuId = xfStuList.Where(x => x.OrderId == item.OrderId).FirstOrDefault()?.Q_StudentId ?? 0;
+                        int enterId = xfStuList.Where(x => x.Q_StudentId == stuId).OrderBy(x => x.OrderId).FirstOrDefault()?.EnterID ?? 0;
+
+                        if (enterId != item.EnterID) { item.EnterID = enterId; }
+                    }
+                }
+                #endregion
+
                 #region 老师订单5.10日需求
 
                 //ld2023-03-21  转介绍学生的老师  有2%提成   留学订单200
@@ -1083,6 +1102,7 @@ namespace Edu.Module.Course
                             }
                             //计算当月人头数  计算人头奖励  包含续费的
                             int PeopleNum = sellOrderList.Where(x => x.Refund <= 0).Count();
+                            var RenewOrder = sellOrderList.Where(x => x.JoinType == Common.Enum.Sale.OrderJoinTypeEnum.RenewOrder).ToList();
                             sellOrderList = sellOrderList.Where(x => x.JoinType != Common.Enum.Sale.OrderJoinTypeEnum.RenewOrder).ToList();//市场排除续费订单
                             if (sellOrderList.Any())
                             {
@@ -1209,6 +1229,40 @@ namespace Edu.Module.Course
                                 }
                             }
 
+                            // 续费算  市场部 人头   （暂时确认为 所有的  续费都算）
+                            if (RenewOrder.Any()) {
+                                var awardModel = item.ZGAwardList.Where(x => x.StartValue <= PeopleNum && (x.EndValue >= PeopleNum || x.EndValue == -1)).FirstOrDefault();
+                                //没有提成   只有人头奖励
+                                if ((awardModel?.Rate ?? 0) > 0)
+                                {
+                                    //没有达标提成  只发放  人头奖励
+                                    foreach (var qitem in RenewOrder)
+                                    {
+                                        //当前订单的业绩
+                                        AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
+                                        {
+                                            EmpId = qitem.EnterID,
+                                            GiveOutMoney = 0,
+                                            GiveOutState = 2,
+                                            Group_Id = userInfo.Group_Id,
+                                            Id = 0,
+                                            IsDept = 2,
+                                            OrderId = qitem.OrderId,
+                                            PeriodsId = 0,
+                                            Rate = 0,
+                                            PushMoney = 0,
+                                            RuleId = item.Id,
+                                            SaleMoney = 0,
+                                            OrderSaleMoney = 0,
+                                            PeopleNumMoney = awardModel?.Rate ?? 0,
+                                            Type = 1,
+                                            IsCommonDept = item.IsDeptAward,
+                                            Remark = "当月部门人头：" + PeopleNum + "人，人头奖励：" + (awardModel?.Rate ?? 0) + "，续费订单，只发放人头奖励"
+                                        });
+                                    }
+                                }
+                            }
+
                             #region 屏蔽
                             //if (item.ExtraMoney > 0)
                             //{//有效到访额外奖励

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -1312,6 +1312,21 @@ group by o.OrderId
 ;";
             return Get<RB_Order_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取续费订单的 首单市场人员
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Order_ViewModel> GetXFOrderFirstEnterList(int groupId, string orderIds) {
+            string sql = $@"SELECT o.OrderId,o.EnterID,t.Student_Id as Q_StudentId FROM rb_student_orderguest t
+left join rb_student_orderguest t2 on t.Student_Id = t2.Student_Id
+left join rb_order o  on t2.OrderId =o.OrderId
+WHERE o.Group_Id={groupId} and t.OrderId in({orderIds}) and o.OrderState =1 and o.PreferPrice>0
+";
+            return Get<RB_Order_ViewModel>(sql).ToList();
+        }
         #endregion
 
         /// <summary>

Edu.WebApi/Controllers/Course/SellAchievementsController.cs

@@ -494,7 +494,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: item.DeptName){ },
                             new ExcelColumn(value: item.UserType == 1?"市场":item.UserType ==2?"顾问":"教师"){ },
                             new ExcelColumn(value: item.UserName){ },
-                            new ExcelColumn(value: item.IsDept==1?"部门":"个人"){ },
+                            new ExcelColumn(value: item.IsCommonDept==1?"部门":"个人"){ },
                             new ExcelColumn(value: item.ClassNo){ },
                             new ExcelColumn(value: item.OrderSaleMoney.ToString("#0.00")){ },
                             new ExcelColumn(value: item.ClassName){ },