提交代码

Mall.Common/Enum/User/UserSourceEnum.cs

@@ -42,5 +42,10 @@ namespace Mall.Common.Enum.User
         /// </summary>
         [EnumField("ERP")]
         ERP =6,
+        /// <summary>
+        /// 教育ERP
+        /// </summary>
+        [EnumField("教育ERP")]
+        EduERP = 7,
     }
 }

Mall.Model/Entity/Education/RB_Education_Consult.cs

@@ -77,11 +77,20 @@ namespace Mall.Model.Entity.Education
         public decimal UnitPrice { get; set; }
 
         /// <summary>
-        /// 支付金额
+        /// 应收金额
         /// </summary>
         public decimal Money { get; set; }
 
 
+        /// <summary>
+        /// 实收金额
+        /// </summary>
+        public decimal Income { get; set; }
+
+        /// <summary>
+        /// 手续费
+        /// </summary>
+        public decimal PlatformTax { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
@@ -133,6 +142,12 @@ namespace Mall.Model.Entity.Education
         /// </summary>
         public string RefundOrderNo { get; set; }
 
+
+        /// <summary>
+        /// 实际退款金额
+        /// </summary>
+        public decimal RefundPrice { get; set; }
+
         /// <summary>
         /// 退款时间
         /// </summary>
@@ -155,7 +170,7 @@ namespace Mall.Model.Entity.Education
             set;
         }
 
-        public Common.Enum.Goods.OrderPayTypeEnum? PayWay {get;set;}
+        public Common.Enum.Goods.OrderPayTypeEnum? PayWay { get; set; }
         /// <summary>
         /// 订单号
         /// </summary>        
@@ -178,5 +193,28 @@ namespace Mall.Model.Entity.Education
         /// 是否需取消确认   1是  2否
         /// </summary>
         public int IsCancelConfirm { get; set; }
+
+        /// <summary>
+        /// 教育销售id
+        /// </summary>
+        public int EduUserId { get; set; }
+
+
+        /// <summary>
+        /// 教育学生id
+        /// </summary>
+        public int EduStudentId { get; set; }
+
+
+
+        /// <summary>
+        /// 用户id，所有的父级，英文逗号分隔
+        /// </summary>
+        public string UserTree { get; set; }
+
+        /// <summary>
+        /// 分销商id，所有的父级分销商，英文逗号分隔
+        /// </summary>
+        public string DistributorTree { get; set; }
     }
 }

Mall.Model/Entity/Education/RB_Education_EduSell.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Education
+{
+
+    /// <summary>
+    /// 教育销售的基础信息
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_EduSell
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 会员id
+        /// </summary>
+        public int UserId { get; set; }
+
+
+        /// <summary>
+        /// 销售id（对应教育那边的rb_account的id）
+        /// </summary>
+        public int EduSellId { get; set; }
+
+
+        /// <summary>
+        /// 商户号Id
+        /// </summary>        
+        public int? TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>        
+        public int? MallBaseId
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+
+    }
+}

Mall.Model/Entity/Finance/Rb_Workflow_AuditRelevance.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Finance
+{
+    /// <summary>
+	/// Rb_Workflow_AuditRelevance:实体类(属性说明自动提取数据库字段的描述信息)
+	/// </summary>
+	[Serializable]
+    [DB(ConnectionName = "FinanceConnection")]
+    public class Rb_Workflow_AuditRelevance
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审批条件id
+        /// </summary>        
+        public int? ConditionId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审核人类型  1主管(指定一级) 2 指定成员  3角色
+        /// </summary>        
+        public int? AuditType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1依次审批（本环节内审批人依次审批） 2 会签（须所有审批人同意）3或签（一名审批人同意或拒绝即可）
+        /// </summary>        
+        public int? AuditWay
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 存发起人或者岗位部门关联表id   发起人1 表示直属主管   2表示再上一级   依次类推
+        /// </summary>        
+        public int? RoleOrInitiator
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 步骤（排序）
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// AuditDescription
+        /// </summary>        
+        public string AuditDescription
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否特殊节点0-常规1-出纳收款2-出纳付款
+        /// </summary>
+        public int? SpecialNode
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 工作流id
+        /// </summary>        
+        public int? WorkFlowId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1请假  2出差  3  外出  4  补卡
+        /// </summary>        
+        public int? TemplateType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 原审核id
+        /// </summary>        
+        public int? OriginalAuditId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1未审核  2审核通过  3 不通过  4 驳回
+        /// </summary>        
+        public int? Stauts
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 待审核人  1,2,3 以逗号分隔
+        /// </summary>
+        public string ToAuditId { get; set; }
+        /// <summary>
+        /// 已审核人   1,2,3  以逗号分割
+        /// </summary>
+        public string AuditedId { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_Consult_Extend.cs

@@ -60,5 +60,37 @@ namespace Mall.Model.Extend.Education
         /// 活动地址
         /// </summary>
         public string LocationName { get; set; }
+
+        /// <summary>
+        /// 报名时间
+        /// </summary>
+        public string CreateStartTime { get; set; }
+
+        /// <summary>
+        /// 报名时间
+        /// </summary>
+        public string CreateEndTime { get; set; }
+
+        /// <summary>
+        /// 销售名称
+        /// </summary>
+        public string EduSellName { get; set; }
+
+        /// <summary>
+        /// 生日
+        /// </summary>
+        public string StuBirth { get; set; }
+    }
+
+
+    /// <summary>
+    /// 活动报名统计
+    /// </summary>
+    public class RB_Education_Consult_Statistics: RB_Education_Consult
+    {
+      
+        public decimal DueInMoney { get; set; }
+        public int GuestNum { get; set; }
+        public int CancelNum { get; set; }
     }
 }

Mall.Model/Extend/Education/RB_Education_EduSell_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 教育销售扩展表
+    /// </summary>
+    public class RB_Education_EduSell_Extend : RB_Education_EduSell
+    {
+        public Employee_ViewModel employeeModel { get; set; }
+
+        public string Ids { get; set; }
+    }
+}

Mall.Model/Extend/Finance/RB_Finance_Extend.cs

@@ -122,6 +122,17 @@ namespace Mall.Model.Extend.Finance
         /// 凭证实体
         /// </summary>
         public List<RB_Voucher_Extend> vorcherInos { get; set; }
+
+
+        /// <summary>
+        /// 财务单据颜色1-蓝色-已打单 2-平台出纳审核绿色- 3-银行出纳审核红色 4-通过
+        /// </summary>
+        public int? ColorType { get; set; }
+
+        /// <summary>
+        /// 财务单据名称
+        /// </summary>
+        public string StatusName { get; set; }
     }
 
 

Mall.Model/Extend/Finance/Rb_Workflow_AuditRelevance_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Finance;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Finance
+{
+    /// <summary>
+    /// 审核步骤实体
+    /// </summary>    
+    [Serializable]
+    [DB(ConnectionName = "FinanceConnection")]
+    public class Rb_Workflow_AuditRelevance_Extend : Rb_Workflow_AuditRelevance
+    {
+        /// <summary>
+        /// 指定员工ID列表
+        /// </summary>
+        public List<int> emList { get; set; }
+        /// <summary>
+        /// 待审核人名称
+        /// </summary>
+        public string ToAuditName { get; set; }
+        /// <summary>
+        /// 审核记录列表
+        /// </summary>
+      //  public List<Rb_Workflow_Auditrecord_Extend> AuditRecordList { get; set; }
+        /// <summary>
+        /// 是否是下一步1-是0-否
+        /// </summary>
+        public int? NextStep
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否出纳审核1-是
+        /// </summary>
+        public int? CashierAudit
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 财务审核常规流程列表
+        /// </summary>
+        public List<AuditInfo> AuditInfoList
+        {
+            get; set;
+        }
+        #region 财务审核步骤实体
+        /// <summary>
+        /// 审核人审核时间
+        /// </summary>
+        public class AuditInfo
+        {
+            /// <summary>
+            /// 审核记录ID
+            /// </summary>
+            public int? ID
+            {
+                get; set;
+            }
+            /// <summary>
+            /// 审核人
+            /// </summary>
+            public string AuditName
+            {
+                get; set;
+            }
+            /// <summary>
+            /// 审核时间
+            /// </summary>
+            public DateTime? AduitDate
+            {
+                get; set;
+            }
+            /// <summary>
+            /// 备注
+            /// </summary>
+            public string Remark
+            {
+                get; set;
+            }
+            /// <summary>
+            /// 审核状态
+            /// </summary>
+            public int? AuditStatus
+            {
+                get; set;
+            }
+            /// <summary>
+            /// 特殊节点
+            /// </summary>
+            public int? CashierAudit
+            {
+                get; set;
+            }
+            /// <summary>
+            /// 图片集合
+            /// </summary>
+            public List<string> Image { get; set; }
+        }
+        #endregion
+    }
+}

Mall.Module.User/UserModule.cs

@@ -6004,7 +6004,7 @@ namespace Mall.Module.User
             int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
             if (IsNormalServer != 1)
             {
-                token = "46__bXdCmXKR-3O68ayCYYCJd9KIYUFD-5IkiYJHlJb7ORV7PfpNPp7Csf9KcwMAU42oDaRFfj__NI_N8ZI3_-RqTMeDq9UM3pU1k7ceBAg1miucYcwtwj0UAMx1j_NWkwX3AoMeGdVhA9GWcXaKVTfABADOM";
+                token = "46_j34B0dYxaINcVzqoZB4dFegSrFwJt8n4qHSfi7nPOk6LjGWr7fTL2mVTsnip4h-vfaMypZ5a_0lZYJKv2BVsV9KPC9jQHhFVP59z_gJQssian0QqZF6YU8qMSqt-D5x-CpOeOV_kJ6qg9h6XJJUhAJABBM";
             }
             if (string.IsNullOrEmpty(token))
             {
@@ -6088,7 +6088,7 @@ namespace Mall.Module.User
             int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
             if (IsNormalServer != 1)
             {
-                token = "46__bXdCmXKR-3O68ayCYYCJd9KIYUFD-5IkiYJHlJb7ORV7PfpNPp7Csf9KcwMAU42oDaRFfj__NI_N8ZI3_-RqTMeDq9UM3pU1k7ceBAg1miucYcwtwj0UAMx1j_NWkwX3AoMeGdVhA9GWcXaKVTfABADOM";
+                token = "46_j34B0dYxaINcVzqoZB4dFegSrFwJt8n4qHSfi7nPOk6LjGWr7fTL2mVTsnip4h-vfaMypZ5a_0lZYJKv2BVsV9KPC9jQHhFVP59z_gJQssian0QqZF6YU8qMSqt-D5x-CpOeOV_kJ6qg9h6XJJUhAJABBM";
             }
             if (string.IsNullOrEmpty(token))
             {
@@ -6135,7 +6135,7 @@ namespace Mall.Module.User
             int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
             if (IsNormalServer != 1)
             {
-                token = "46__bXdCmXKR-3O68ayCYYCJd9KIYUFD-5IkiYJHlJb7ORV7PfpNPp7Csf9KcwMAU42oDaRFfj__NI_N8ZI3_-RqTMeDq9UM3pU1k7ceBAg1miucYcwtwj0UAMx1j_NWkwX3AoMeGdVhA9GWcXaKVTfABADOM";
+                token = "46_j34B0dYxaINcVzqoZB4dFegSrFwJt8n4qHSfi7nPOk6LjGWr7fTL2mVTsnip4h-vfaMypZ5a_0lZYJKv2BVsV9KPC9jQHhFVP59z_gJQssian0QqZF6YU8qMSqt-D5x-CpOeOV_kJ6qg9h6XJJUhAJABBM";
             }
             if (string.IsNullOrEmpty(token))
             {

Mall.Repository/Education/RB_AccountRepository.cs

@@ -135,7 +135,7 @@ namespace Mall.Repository.Education
 
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
+SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.`Password`,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
       ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType,A.Email,IFNULL(A.DirectSupervisor,0) AS DirectSupervisor
       ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
       ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostId,0) AS Post_Id, IFNULL(p.PostName,'') AS PostName

Mall.Repository/Education/RB_Education_EduSellRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_EduSellRepository : BaseRepository<RB_Education_EduSell>
+    {
+        /// <summary>
+        /// 获取教育销售的基础信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_EduSell_Extend> GetEducationSellBaseInfo(RB_Education_EduSell_Extend query)
+        {
+
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Education_EduSell
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_EduSell_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_EduSell_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_EduSell_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_EduSell_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_EduSell_Extend.UserId), query.UserId);
+                }
+                if (query.EduSellId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_EduSell_Extend.EduSellId), query.EduSellId);
+                }
+                if (!string.IsNullOrWhiteSpace(query.Ids))
+                {
+                    builder.AppendFormat($@" AND { nameof(RB_Education_EduSell_Extend.UserId)} in ({query.Ids}) ");
+                }
+            }
+            return Get<RB_Education_EduSell_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_StudentRepository.cs

@@ -52,5 +52,62 @@ namespace Mall.Repository.Education
             }
             return Get<RB_Student>(builder.ToString()).ToList();
         }
+
+
+        /// <summary>
+        /// 获取学生列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student> GetStudentListByEnterID(RB_Student query,int EnterID)
+        {
+
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"SELECT t.* from rb_student as t LEFT JOIN RB_Student_OrderGuest  as sog on t.StuId=sog.Student_Id
+LEFT JOIN rb_order_guest as og on og.Id=sog.GuestId
+LEFT JOIN rb_order as o on o.OrderId=og.OrderId  WHERE 1=1  and o.OrderState<>3  and og.`Status`=0 and sog.`Status`=0");
+            builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > -1)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.School_Id), query.School_Id);
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.StuTel))
+                {
+                    builder.AppendFormat(" AND t.{0}='{1}' ", nameof(RB_Student.StuTel), query.StuTel);
+                    // parameters.Add("StuTel", "%" + query.StuTel.Trim() + "%");
+                }
+                if (query.ProviceId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.ProviceId), query.ProviceId);
+                }
+                if (query.CityId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.CityId), query.CityId);
+                }
+                if (query.AreaId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.AreaId), query.AreaId);
+                }
+                if (query.StuId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.StuId), query.StuId);
+                }
+                if (EnterID > 0)
+                {
+                    builder.AppendFormat(" AND o.EnterID={0} ", EnterID);
+                }
+            }
+            return Get<RB_Student>(builder.ToString()).ToList();
+        }
+
+
+
     }
 }

Mall.Repository/Finance/RB_FinanceRepository.cs

@@ -207,9 +207,9 @@ where {where} order by FrID desc
             {
                 where += string.Format(" AND A." + nameof(RB_Finance.OrderID) + " ={0}", model.OrderID);
             }
-            if (model.ReFinanceId > 0)
+            if (model.ReFinanceId2 > 0)
             {
-                where += string.Format(" AND A." + nameof(RB_Finance.ReFinanceId) + " ={0}", model.ReFinanceId);
+                where += string.Format(" AND A." + nameof(RB_Finance.ReFinanceId2) + " ={0}", model.ReFinanceId2);
             }
             if (!string.IsNullOrWhiteSpace(model.OrderIdStr))
             {

Mall.Repository/Finance/Rb_Workflow_AuditRelevanceRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.Finance;
+using Mall.Model.Extend.Finance;
+
+namespace Mall.Repository.Finance
+{
+    /// <summary>
+    /// 审核节点拷贝信息扩展表
+    /// </summary>
+    public  class Rb_Workflow_AuditRelevanceRepository : BaseRepository<Rb_Workflow_AuditRelevance>
+    {
+        /// <summary>
+        /// 根据工作流id和模版类型获取所有审核流程
+        /// </summary>
+        /// <param name="WorkFlowId">工作流ID</param>
+        /// <param name="FrIdStr"></param>
+        /// <param name="status"></param>
+        /// <returns></returns>
+        public List<Rb_Workflow_AuditRelevance_Extend> GetAuditRelevanceList(int WorkFlowId, string FrIdStr = "", int? status = null)
+        {
+            string where = $@" where 1=1 ";
+            if (WorkFlowId > 0)
+            {
+                where += $@" and ar.{nameof(Rb_Workflow_AuditRelevance.WorkFlowId) }={WorkFlowId}";
+            }
+            if (!string.IsNullOrWhiteSpace(FrIdStr))
+            {
+                where += $@" and ar.{nameof(Rb_Workflow_AuditRelevance.WorkFlowId) } in({FrIdStr})";
+            }
+            if (status != null)
+            {
+                where += $@" and ar.{nameof(Rb_Workflow_AuditRelevance.Stauts) }={(int)status}";
+            }
+            string sql = $@"SELECT ar.* from rb_workflow_auditrelevance ar {where} ORDER BY ar.Sort asc";
+            return Get<Rb_Workflow_AuditRelevance_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 根据工作流ids获取所有审核流程
+        /// </summary>
+        /// <param name="FinanceIds"></param>
+        /// <returns></returns>
+        public List<Rb_Workflow_AuditRelevance_Extend> GetAuditRelevanceListForFIds(string FinanceIds)
+        {
+            string where = $@" where 1=1 and ar.{nameof(Rb_Workflow_AuditRelevance.Stauts)}=1";
+            if (!string.IsNullOrWhiteSpace(FinanceIds))
+            {
+                where += $@" and ar.{nameof(Rb_Workflow_AuditRelevance.WorkFlowId) } in({FinanceIds})";
+            }
+            string sql = $@"SELECT ar.* from rb_workflow_auditrelevance ar {where} ORDER BY ar.Sort asc";
+            return Get<Rb_Workflow_AuditRelevance_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 通过审核ID查询审核信息
+        /// </summary>
+        /// <param name="AuditIds"></param>
+        /// <param name="FinanceAuditType">财务节点类型枚举</param>
+        /// <returns></returns>
+        public List<Rb_Workflow_AuditRelevance_Extend> GetAuditRelevanceList(string AuditIds, int FinanceAuditType = 0)
+        {
+            string where = $@" where 1=1 ";
+            if (!string.IsNullOrEmpty(AuditIds))
+            {
+                where += $@" and ar.{nameof(Rb_Workflow_AuditRelevance.Id) } in ({AuditIds})";
+            }
+            if (FinanceAuditType > 0)
+            {
+                where += $@" and ar.{nameof(Rb_Workflow_AuditRelevance.SpecialNode) }= ({(int)FinanceAuditType})";
+            }
+            string sql = $@"SELECT ar.* from rb_workflow_auditrelevance ar {where} ORDER BY ar.Sort asc";
+            return Get<Rb_Workflow_AuditRelevance_Extend>(sql).ToList();
+        }
+
+    }
+}

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -610,7 +610,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             // couponModule.UpdateDepositBuy(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, PayType, dPaid, PayDate);
             return ApiResult.Success("");
         }
-        
+
 
 
 
@@ -921,6 +921,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             demodel.Status = 0;
             demodel.IsCancelConfirm = model.IsCancelConfirm;
             demodel.CreateTime = System.DateTime.Now;
+            demodel.EduStudentId = (bmodel != null && bmodel.Id > 0) ? bmodel.StudentId : 0;
             var umodel = userModule.GetMemberUserInfo(demodel.UserId);
             demodel.OrderSource = umodel.Source;
             //判断当前人的点数

Mall.WebApi/Controllers/Education/AppletEducationController.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Mall.CacheManager.User;
+using Mall.Common;
 using Mall.Common.API;
+using Mall.Common.Enum;
+using Mall.Common.Enum.Goods;
+using Mall.Common.Enum.MarketingCenter;
+using Mall.Common.Plugin;
+using Mall.Model.Entity.Education;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.Education;
+using Mall.Model.Extend.MarketingCenter;
+using Mall.Model.Extend.Product;
 using Mall.Model.Extend.User;
+using Mall.Module.Education;
 using Mall.Module.User;
 using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using Mall.Common.Plugin;
-using Mall.Common.Enum.User;
 using Newtonsoft.Json.Linq;
-using Mall.Model.Extend.Product;
-using Mall.Model.Extend.MarketingCenter;
-using Mall.Module.BaseSetUp;
-using Mall.Common;
-using Mall.CacheManager.User;
-using Microsoft.AspNetCore.Authorization;
-using Mall.Module.Education;
-using Mall.Model.Extend.Education;
-using Mall.Model.Entity.Education;
-using Mall.Common.Enum;
-using Mall.Common.Enum.MarketingCenter;
-using Mall.Model.Entity.MarketingCenter;
-using Microsoft.AspNetCore.Http;
-using Mall.Common.Enum.Goods;
 
 namespace Mall.WebApi.Controllers.Education
 {
@@ -1895,7 +1893,7 @@ namespace Mall.WebApi.Controllers.Education
                 if (model.ActivityTitleList != null && model.ActivityTitleList.Any())
                 {
                     var planList = activityModule.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
-                    if (planList!=null&& planList.Any())
+                    if (planList != null && planList.Any())
                     {
                         planList.ForEach(x => x.TripPicList = !string.IsNullOrWhiteSpace(x.TripPic) ? JsonConvert.DeserializeObject<List<string>>(x.TripPic) : new List<string>());
                         foreach (var item in model.ActivityTitleList)
@@ -1991,7 +1989,7 @@ namespace Mall.WebApi.Controllers.Education
                     string refundid = dic["refundid"];//微信退款单号
                     string outRefundNo = dic["outRefundNo"];//商户退款单号
 
-                    flag = activityModule.CancelCommerceConsultModule(ActivityId, CancelRemark, out int IsCancelConfirm, userInfo.UserId, refundid, model);
+                    flag = activityModule.CancelCommerceConsultModule(ActivityId, CancelRemark, out int IsCancelConfirm, userInfo.UserId, refundid, model, dPaid);
                     return flag ? ApiResult.Success("", IsCancelConfirm) : ApiResult.Failed();
                 }
                 else
@@ -2001,7 +1999,7 @@ namespace Mall.WebApi.Controllers.Education
             }
             else
             {
-                flag = activityModule.CancelCommerceConsultModule(ActivityId, CancelRemark, out int IsCancelConfirm, userInfo.UserId, "", model);
+                flag = activityModule.CancelCommerceConsultModule(ActivityId, CancelRemark, out int IsCancelConfirm, userInfo.UserId, "", model, 0);
                 return flag ? ApiResult.Success("", IsCancelConfirm) : ApiResult.Failed();
             }
             return ApiResult.Failed("报名取消失败，请联系客服");
@@ -2209,5 +2207,97 @@ namespace Mall.WebApi.Controllers.Education
         }
 
         #endregion
+
+
+
+        #region 绑定销售
+        /// <summary>
+        /// 绑定甲鹤销售
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpPost]
+        public ApiResult GetBindEduSell()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            JObject jobj = JObject.Parse(req.msg.ToString());
+
+            string eduSellAccount = jobj.GetStringValue("EduSellAccount");
+            string password = jobj.GetStringValue("password");
+            if (string.IsNullOrWhiteSpace(eduSellAccount) || string.IsNullOrWhiteSpace(password))
+            {
+                return ApiResult.Failed("账户或密码不能为空");
+            }
+            var model = activityModule.GetEmployeeListModule(new Employee_ViewModel()
+            {
+                Account = eduSellAccount,
+                School_Id = -1
+            })?.FirstOrDefault();
+            if (model == null)
+            {
+                return ApiResult.Failed("该账号不存在");
+            }
+
+            password = Common.DES.Encrypt(password);
+            if (model.Password != password)
+            {
+                return ApiResult.Failed("密码错误");
+            }
+
+            //判断改手机号码是否绑定其他了用户了
+            var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, EduSellId = model.Id }).FirstOrDefault();
+            if (eduModel != null && eduModel.UserId != userInfo.UserId)
+            {
+                return ApiResult.Failed("账户已绑定其他用户");
+            }
+
+            //  var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
+            if (eduModel == null || eduModel.Id == 0)
+            {
+                eduModel = new RB_Education_EduSell_Extend();
+                eduModel.Id = 0;
+                eduModel.TenantId = userInfo.TenantId;
+                eduModel.MallBaseId = userInfo.MallBaseId;
+                eduModel.CreateDate = System.DateTime.Now;
+                eduModel.Status = 0;
+                eduModel.UserId = userInfo.UserId;
+            }
+            eduModel.EduSellId = model.Id;
+            bool result = activityModule.SetEduSellBaseInfo(eduModel);
+
+            return result ? ApiResult.Success("销售信息绑定成功") : ApiResult.Failed("销售信息绑定失败");
+
+        }
+
+
+        /// <summary>
+        /// 获取用户绑定的甲鹤销售
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpPost]
+        public ApiResult GetBindEduSellInfo()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+
+            var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
+            if (eduModel == null || eduModel.Id == 0)
+            {
+                eduModel = new RB_Education_EduSell_Extend();
+            }
+
+            return ApiResult.Success("", new
+            {
+                eduModel.Id,
+                EmpId = eduModel.employeeModel?.Id ?? 0,
+                EmployeeName = eduModel.employeeModel?.EmployeeName ?? "",
+                UserIcon = eduModel.employeeModel?.UserIcon ?? "",
+                PostName = eduModel.employeeModel?.PostName ?? "",
+                DeptName = eduModel.employeeModel?.DeptName ?? "",
+            });
+        }
+        #endregion
     }
 }
\ No newline at end of file