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

Edu.Model/Entity/Bonus/RB_Personnel_BonusDetail.cs

-using System;
+using Edu.Common.Enum.Course;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using VT.FW.DB;
@@ -22,16 +23,24 @@ namespace Edu.Model.Entity.Bonus
 		/// </summary>
 		public int BonusId { get; set; }
 
+		/// <summary>
+		/// 订单编号
+		/// </summary>
+		public int OrderId { get; set; }
+
+		/// <summary>
+		/// 订单状态
+		/// </summary>
+		public OrderStateEnum OrderState { get; set; }
 
 		/// <summary>
 		/// 订单人数
 		/// </summary>
-		public int GuestNum { get; set; }
+		public int OrderGuestNum { get; set; }
 
 		/// <summary>
 		/// 订单金额
 		/// </summary>
 		public decimal OrderMoney { get; set; }
-
 	}
 }

Edu.Model/Entity/Bonus/RB_Personnel_BonusLog.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励日志实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Personnel_BonusLog
+    {
+		/// <summary>
+		/// 奖励日志编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 奖励主表编号
+		/// </summary>
+		public int BonusId { get; set; }
+
+		/// <summary>
+		/// 日志类型(1-订单改变日志）
+		/// </summary>
+		public int LogType { get; set; }
+
+		/// <summary>
+		/// 订单编号
+		/// </summary>
+		public int OrderId { get; set; }
+
+		/// <summary>
+		/// 日志内容
+		/// </summary>
+		public string LogContent { get; set; }
+	}
+}

Edu.Model/Entity/Course/RB_Course.cs

@@ -296,5 +296,35 @@ namespace Edu.Model.Entity.Course
         /// 返佣类型   1按课耗反    2付款返佣
         /// </summary>
         public int CommissionReType { get; set; }
+
+        /// <summary>
+        /// 直客首次报名返佣比例
+        /// </summary>
+        public decimal B2CRbRatio { get; set; }
+
+        /// <summary>
+        /// 直客首次报名返佣类型
+        /// </summary>
+        public CourseRebateSetEnum B2CRbRatioType { get; set; }
+
+        /// <summary>
+        /// 直客首次报名返佣类型值
+        /// </summary>
+        public decimal B2CRbRatioValue { get; set; }
+
+        /// <summary>
+        /// 直客续费返佣比例
+        /// </summary>
+        public decimal B2CRNRatio { get; set; }
+
+        /// <summary>
+        /// 直客续费返佣类型
+        /// </summary>
+        public CourseRebateSetEnum B2CRNRatioType { get; set; }
+
+        /// <summary>
+        /// 直客续费返佣类型值
+        /// </summary>
+        public decimal B2CRNRatioValue { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Bonus/RB_Personnel_BonusLog_Extend.cs

+using Edu.Model.Entity.Bonus;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励日志扩展实体类
+    /// </summary>
+    public class RB_Personnel_BonusLog_Extend : RB_Personnel_BonusLog
+    {
+    }
+}

Edu.Model/ViewModel/Bonus/RB_Personnel_Bonus_Extend.cs

@@ -10,5 +10,9 @@ namespace Edu.Model.ViewModel.Bonus
     /// </summary>
     public class RB_Personnel_Bonus_Extend : RB_Personnel_Bonus
     {
+        /// <summary>
+        /// 人头奖励详情列表
+        /// </summary>
+        public List<RB_Personnel_BonusDetail_Extend> DetailList { get; set; }
     }
 }

Edu.Module.Course/CourseModule.cs

@@ -1513,6 +1513,14 @@ namespace Edu.Module.Course
                     {nameof(RB_Course_ViewModel.TransIntroductceReNewRatioValue),courseModel.TransIntroductceReNewRatioValue },
 
                     {nameof(RB_Course_ViewModel.CommissionReType),courseModel.CommissionReType },
+
+                    {nameof(RB_Course_ViewModel.B2CRbRatio),courseModel.B2CRbRatio },
+                    {nameof(RB_Course_ViewModel.B2CRbRatioType),courseModel.B2CRbRatioType },
+                    {nameof(RB_Course_ViewModel.B2CRbRatioValue),courseModel.B2CRbRatioValue },
+
+                    {nameof(RB_Course_ViewModel.B2CRNRatio),courseModel.B2CRNRatio },
+                    {nameof(RB_Course_ViewModel.B2CRNRatioType),courseModel.B2CRNRatioType },
+                    {nameof(RB_Course_ViewModel.B2CRNRatioValue),courseModel.B2CRNRatioValue },
                 };
                 flag = courseRepository.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), courseModel.CourseId));
             }

Edu.Module.Course/EducationContractModule.cs

@@ -814,7 +814,8 @@ namespace Edu.Module.Course
                 var newPreferPrice = orderModel.PreferPrice - backModel.RealityBackMoney;
                 Dictionary<string, object> orderFileds = new Dictionary<string, object>()
                 {
-                    {nameof(RB_Order_ViewModel.PreferPrice),newPreferPrice }
+                    {nameof(RB_Order_ViewModel.PreferPrice),newPreferPrice },
+                    {nameof(RB_Order_ViewModel.OrderState),(int)OrderStateEnum.DropOut  },
                 };
                 flag = orderRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), backModel.OrderId));
                 #endregion

Edu.Module.Customer/CustomerModule.cs

@@ -145,8 +145,7 @@ namespace Edu.Module.Customer
             }
             else
             {
-                model.ApproveState = 0;
-                model.CustomerState = Common.Enum.Customer.CustomerStateEnum.NotActivation;
+                model.CustomerState = Common.Enum.Customer.CustomerStateEnum.Normal;
                 model.Password  = Common.DES.Encrypt(Common.Config.DefaultPwd);
                 var newId = customerRepository.Insert(model);
                 model.CustomerId = newId;

Edu.Repository/Bonus/RB_Personnel_BonusLogRepository.cs

+using Edu.Model.Entity.Bonus;
+using Edu.Model.ViewModel.Bonus;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Bonus
+{
+    /// <summary>
+    /// 员工人头奖励日志仓储层
+    /// </summary>
+    public class RB_Personnel_BonusLogRepository:BaseRepository<RB_Personnel_BonusLog>
+    {
+        /// <summary>
+        /// 获取员工人头奖励日志分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Personnel_BonusLog_Extend> GetPersonnelBonusLogPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Personnel_BonusLog_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_Personnel_BonusLog AS A
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (query.BonusId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_BonusLog_Extend.BonusId), query.BonusId);
+                }
+                if (query.LogType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_BonusLog_Extend.LogType), query.LogType);
+                }
+                if (query.OrderId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_BonusLog_Extend.OrderId), query.OrderId);
+                }
+            }
+            return GetPage<RB_Personnel_BonusLog_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 新增日志
+        /// </summary>
+        /// <param name="BonusId"></param>
+        /// <param name="LogType"></param>
+        /// <param name="OrderId"></param>
+        /// <param name="LogContent"></param>
+        /// <returns></returns>
+        public bool AddPersonnelBonusLogRepository(int BonusId,int LogType,int OrderId,string LogContent)
+        {
+            var newModel = new RB_Personnel_BonusLog()
+            {
+                BonusId = BonusId,
+                LogType = LogType,
+                OrderId = OrderId,
+                LogContent = LogContent
+            };
+            var newId = base.Insert(newModel);
+            return newId > 0;
+        }
+    }
+
+}

Edu.Repository/Bonus/RB_Personnel_BonusRepository.cs

@@ -12,6 +12,11 @@ namespace Edu.Repository.Bonus
     /// </summary>
     public class RB_Personnel_BonusRepository : BaseRepository<RB_Personnel_Bonus>
     {
+        /// <summary>
+        /// 员工人头奖励详情仓储层对象
+        /// </summary>
+        private readonly RB_Personnel_BonusDetailRepository personnel_BonusDetailRepository = new RB_Personnel_BonusDetailRepository();
+
         /// <summary>
         /// 获取员工人头奖励分页列表
         /// </summary>
@@ -46,5 +51,56 @@ WHERE 1=1
             }
             return GetPage<RB_Personnel_Bonus_Extend>(pageIndex,pageSize,out rowsCount,builder.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 获取员工人头奖励列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="isGetDetail">true-查询详情</param>
+        /// <returns></returns>
+        public List<RB_Personnel_Bonus_Extend> GetPersonnelBonusListRepository(RB_Personnel_Bonus_Extend query,bool isGetDetail=false)
+        {
+            StringBuilder builder = new StringBuilder();
+
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Personnel_Bonus AS A
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_Bonus_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.YearNum > 0)
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Personnel_Bonus_Extend.YearNum), query.YearNum);
+                }
+                if (query.MonthNum > 0)
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Personnel_Bonus_Extend.MonthNum), query.MonthNum);
+                }
+                if (query.EmployeeId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_Bonus_Extend.EmployeeId), query.EmployeeId);
+                }
+            }
+            var list= Get<RB_Personnel_Bonus_Extend>(builder.ToString()).ToList();
+            if (list != null && list.Count > 0)
+            {
+                string ids = string.Join(",", list.Select(qitem => qitem.Id));
+                List<RB_Personnel_BonusDetail_Extend> detailsList = personnel_BonusDetailRepository.GetPersonnelBonusDetailListRepository(new RB_Personnel_BonusDetail_Extend()
+                {
+                    QBonusIds = ids
+                });
+                foreach (var item in list)
+                {
+                    item.DetailList = detailsList?.Where(qitem => qitem.BonusId == item.Id)?.ToList();
+                }
+            }
+            return list;
+        }
+
     }
 }

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -1192,7 +1192,7 @@ WHERE 1=1
 ");
             builder.AppendFormat(" AND o.OrderState IN({0},{1}) ", (int)OrderStateEnum.Normal, (int)OrderStateEnum.DropOut);
             builder.AppendFormat(" AND o.{0}={1} ", nameof(RB_Order_ViewModel.OrderType), (int)OrderTypeEnum.CourseOrder);
-            builder.AppendFormat(" AND o.CreateTime >= '2021-12-01' ");
+            builder.AppendFormat(" AND o.CreateTime >= '2021-11-01' ");
             //帐平
             builder.AppendFormat(" AND o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) ");
             if (group_Id > 0)
@@ -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();
         }
     }

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -1267,7 +1267,15 @@ namespace Edu.WebApi.Controllers.Course
                 TransIntroductceReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("TransIntroductceReNewRatioType"),
                 TransIntroductceReNewRatioValue = courseObj.GetDecimal("TransIntroductceReNewRatioValue"),
 
-                CommissionReType = courseObj.GetInt("CommissionReType")
+                CommissionReType = courseObj.GetInt("CommissionReType"),  
+                
+                B2CRbRatio=courseObj.GetDecimal("B2CRbRatio"),
+                B2CRbRatioType=(CourseRebateSetEnum)courseObj.GetInt("B2CRbRatioType"),
+                B2CRbRatioValue=courseObj.GetDecimal("B2CRbRatioValue"),
+
+                B2CRNRatio=courseObj.GetDecimal("B2CRNRatio"),
+                B2CRNRatioType= (CourseRebateSetEnum)courseObj.GetInt("B2CRNRatioType"),
+                B2CRNRatioValue=courseObj.GetDecimal("B2CRNRatioValue"),
             };
             var priceObj = base.ParmJObj.GetStringValue("priceList");
             var list = new List<RB_Course_Preferential_Extend>();
@@ -1361,6 +1369,14 @@ namespace Edu.WebApi.Controllers.Course
 
             extModel.CommissionReType = courseModel.CommissionReType;
 
+            extModel.B2CRbRatio = courseModel.B2CRbRatio;
+            extModel.B2CRbRatioType = courseModel.B2CRbRatioType;
+            extModel.B2CRbRatioValue = courseModel.B2CRbRatioValue;
+
+            extModel.B2CRNRatio = courseModel.B2CRNRatio;
+            extModel.B2CRNRatioType = courseModel.B2CRNRatioType;
+            extModel.B2CRNRatioValue = courseModel.B2CRNRatioValue;
+
             var flag = courseModule.SetCoursePreferentialListModule(extModel, list);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }