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

Edu.Model/Entity/Activity/RB_Activity_Config.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 活动配置实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Activity_Config
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 类型  1按人头   2百分比
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 提成金额/比例   
+        /// </summary>
+        public decimal CommissionMoney { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 集团id
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+    }
+}

Edu.Model/Entity/Activity/RB_Activity_Periods.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 活动期数实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Activity_Periods
+    {
+        /// <summary>
+        ///  编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 期数
+        /// </summary>
+        public string Periods { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 累计金额
+        /// </summary>
+        public decimal SumPrice { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 关联财务单据ids
+        /// </summary>
+        public string Financials { get; set; }
+
+        /// <summary>
+        /// 已发放人员列表
+        /// </summary>
+        public string EmpIds { get; set; }
+
+    }
+}

Edu.Model/Entity/Activity/RB_Activity_PeriodsDetail.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 活动期数明细实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Activity_PeriodsDetail
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 关联用户
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 活动id
+        /// </summary>
+        public int ActivityId { get; set; }
+
+        /// <summary>
+        /// 订单ID
+        /// </summary>
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 提成金额
+        /// </summary>
+        public decimal CommissionMoney { get; set; }
+
+        /// <summary>
+        /// 期数id
+        /// </summary>
+        public int PeriodId { get; set; }
+
+        /// <summary>
+        /// 期号
+        /// </summary>
+        public string Periods { get; set; }
+
+        /// <summary>
+        /// 部门id
+        /// </summary>
+        public int Depart_Id { get; set; }
+
+        /// <summary>
+        /// 校区id
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 集团id
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 电商报名用户Id
+        /// </summary>
+        public int DSUserId { get; set; }
+
+        /// <summary>
+        /// 电商报名用户名称
+        /// </summary>
+        public string DSUserName { get; set; }
+
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivityName { get; set; }
+
+        /// <summary>
+        /// 提成类型  1人头   2比例
+        /// </summary>
+        public int CType { get; set; }
+
+        /// <summary>
+        /// 提成金额/比例
+        /// </summary>
+        public decimal CMoney { get; set; }
+
+        /// <summary>
+        /// 活动时间
+        /// </summary>
+        public DateTime ActivityTime { get; set; }
+    }
+}

Edu.Model/ViewModel/Activity/RB_Activity_PeriodsDetail_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Enum.Sale;
+using Edu.Model.Entity.Course;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 活动配置视图实体类
+    /// </summary>
+    public class RB_Activity_PeriodsDetail_ViewModel : RB_Activity_PeriodsDetail
+    {
+        /// <summary>
+        /// 用户ids
+        /// </summary>
+        public string UserIds { get; set; }
+
+        /// <summary>
+        /// 订单ids
+        /// </summary>
+        public string OrderIds { get; set; }
+
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DeptName { get; set; }
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SchoolName { get; set; }
+    }
+}

Edu.Model/ViewModel/Activity/RB_Activity_Periods_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Enum.Sale;
+using Edu.Model.Entity.Course;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 活动期数视图实体类
+    /// </summary>
+    public class RB_Activity_Periods_ViewModel : RB_Activity_Periods
+    {
+        
+    }
+}

Edu.Model/ViewModel/Activity/RB_Class_Check_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Enum.Sale;
+using Edu.Model.Entity.Course;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 活动配置视图实体类
+    /// </summary>
+    public class RB_Activity_Config_ViewModel : RB_Activity_Config
+    {
+        
+    }
+}

Edu.Repository/Activity/RB_Activity_ConfigRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 活动配置仓储层
+    /// </summary>
+    public class RB_Activity_ConfigRepository : BaseRepository<RB_Activity_Config>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Activity_Config_ViewModel> GetList(RB_Activity_Config_ViewModel demodel)
+        {
+            string where = $@" 1=1 and r.Status =0";
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_Config.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.Type > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_Config.Type)} ={demodel.Type}";
+            }
+
+            string sql = $@" 
+SELECT * From RB_Activity_Config r
+WHERE {where} 
+ORDER BY r.Id DESC ";
+            return Get<RB_Activity_Config_ViewModel>(sql).ToList();
+        }
+
+    }
+}

Edu.Repository/Activity/RB_Activity_PeriodsDetailRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 活动周期明细仓储层
+    /// </summary>
+    public class RB_Activity_PeriodsDetailRepository : BaseRepository<RB_Activity_PeriodsDetail>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_PeriodsDetail_ViewModel> GetList(RB_Activity_PeriodsDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.UserIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} in({demodel.UserIds})";
+            }
+            if (demodel.ActivityId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityId)} ={demodel.ActivityId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+            if (!string.IsNullOrEmpty(demodel.ActivityName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityName)} like '%{demodel.ActivityName}%'";
+            }
+
+
+            string sql = $@" select r.* from RB_Activity_PeriodsDetail r where {where} order by r.Id asc";
+            return Get<RB_Activity_PeriodsDetail_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_PeriodsDetail_ViewModel> GetPageList(int pageIndex,int pageSize,out long count,RB_Activity_PeriodsDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.UserIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} in({demodel.UserIds})";
+            }
+            if (demodel.ActivityId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityId)} ={demodel.ActivityId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+            if (demodel.DSUserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserId)} ={demodel.DSUserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.ActivityName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityName)} like '%{demodel.ActivityName}%'";
+            }
+            if (!string.IsNullOrEmpty(demodel.DSUserName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserName)} like '%{demodel.DSUserName}%'";
+            }
+
+            string sql = $@" select r.* from RB_Activity_PeriodsDetail r where {where} order by r.Id asc";
+            return GetPage<RB_Activity_PeriodsDetail_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取用户提成列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_PeriodsDetail_ViewModel> GetActivityCommissionUserList(RB_Activity_PeriodsDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id >= 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (demodel.ActivityId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityId)} ={demodel.ActivityId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.ActivityName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityName)} like '%{demodel.ActivityName}%'";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+
+
+            string sql = $@" select r.UserId,r.Depart_Id,r.School_Id,sum(r.CommissionMoney) as CommissionMoney 
+from RB_Activity_PeriodsDetail r where {where} group by r.UserId,r.Depart_Id,r.School_Id";
+            return Get<RB_Activity_PeriodsDetail_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 累计提成金额
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public decimal GetSellCommissionStatistics(RB_Activity_PeriodsDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.UserIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} in({demodel.UserIds})";
+            }
+            if (demodel.ActivityId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityId)} ={demodel.ActivityId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+            if (demodel.DSUserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserId)} ={demodel.DSUserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.ActivityName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityName)} like '%{demodel.ActivityName}%'";
+            }
+            if (!string.IsNullOrEmpty(demodel.DSUserName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserName)} like '%{demodel.DSUserName}%'";
+            }
+
+            string sql = $@" select sum(r.CommissionMoney) from RB_Sell_Commission_Details r where {where}";
+            var obj = ExecuteScalar(sql);
+            return obj == null ? 0 : Convert.ToDecimal(obj);
+        }
+
+    }
+}

Edu.Repository/Activity/RB_Activity_PeriodsRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 活动周期仓储层
+    /// </summary>
+    public class RB_Activity_PeriodsRepository : BaseRepository<RB_Activity_Periods>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_Periods_ViewModel> GetList(RB_Activity_Periods_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Name))
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Name)} like '%{demodel.Name}%'";
+            }
+            if (!string.IsNullOrEmpty(demodel.Periods))
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Periods)} ='{demodel.Periods}'";
+            }
+
+            string sql = $@" select r.* from RB_Activity_Periods r where {where} order by r.Id desc";
+            return Get<RB_Activity_Periods_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_Periods_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, RB_Activity_Periods_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Name))
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Name)} like '%{demodel.Name}%'";
+            }
+
+            string sql = $@" select r.* from RB_Activity_Periods r where {where} order by r.Id desc";
+            return GetPage<RB_Activity_Periods_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+    }
+}