Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Common/Plugin/ConvertHelper.cs

@@ -10,7 +10,7 @@ namespace Mall.Common
     /// <summary>
     /// 类型转换帮助类
     /// </summary>
-    public class ConvertHelper
+    public static class ConvertHelper
     {
 
         /// <summary>
@@ -170,5 +170,123 @@ namespace Mall.Common
             }
             return result;
         }
+
+        /// <summary>
+        /// 格式化时间【yyyy-MM-dd HH:mm:ss】
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        public static string FormatTime(this object time)
+        {
+            string timeStr = "";
+            if (time != null)
+            {
+                try
+                {
+                    timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM-dd HH:mm:ss");
+                }
+                catch
+                {
+
+                }
+            }
+            return timeStr;
+        }
+
+        /// <summary>
+        /// 获取时间格式
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        public static string FormatTimeStr(this object time)
+        {
+            string timeStr = "";
+            if (time != null)
+            {
+                try
+                {
+                    timeStr = Convert.ToDateTime(time.ToString()).ToString("HH:mm");
+                }
+                catch
+                {
+
+                }
+            }
+            return timeStr;
+        }
+
+        /// <summary>
+        /// 获取时间格式
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        public static string FormatMonthDay(this object time)
+        {
+            string timeStr = "";
+            if (time != null)
+            {
+                try
+                {
+                    timeStr = Convert.ToDateTime(time.ToString()).ToString("MM-dd");
+                }
+                catch
+                {
+
+                }
+            }
+            return timeStr;
+        }
+
+        /// <summary>
+        /// 格式化时间【yyyy-MM-dd】
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        public static string FormatDate(this object time)
+        {
+            string timeStr = "";
+            if (time != null)
+            {
+                try
+                {
+                    timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM-dd");
+                    if (timeStr == "0001-01-01")
+                    {
+                        timeStr = "";
+                    }
+                }
+                catch
+                {
+
+                }
+            }
+            return timeStr;
+        }
+
+        /// <summary>
+        /// 字符串转List
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static List<int> StringToList(object value)
+        {
+            List<int> list = new List<int>();
+            if (value != null && !string.IsNullOrEmpty(value.ToString()))
+            {
+                var tempArray = value.ToString().Split(',');
+                if (tempArray != null && tempArray.Length > 0)
+                {
+                    foreach (var item in tempArray)
+                    {
+                        Int32.TryParse(item, out int NewValue);
+                        if (NewValue > 0)
+                        {
+                            list.Add(NewValue);
+                        }
+                    }
+                }
+            }
+            return list;
+        }
     }
 }
\ No newline at end of file

Mall.Model/Entity/TradePavilion/RB_Company.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+	/// <summary>
+	/// 公司信息实体类
+	/// </summary>
+	[Serializable]
+	[DB(ConnectionName = "DefaultConnection")]
+	public class RB_Company
+    {
+		/// <summary>
+		/// 主键(公司编号)
+		/// </summary>
+		public int CompanyId { get; set; }
+
+		/// <summary>
+		/// 公司名称
+		/// </summary>
+		public string CompanyName { get; set; }
+
+		/// <summary>
+		/// 公司英文名称
+		/// </summary>
+		public string CompanyEnName { get; set; }
+
+		/// <summary>
+		/// 联系人(责任人)
+		/// </summary>
+		public string Principal { get; set; }
+
+		/// <summary>
+		/// 联系电话
+		/// </summary>
+		public string Mobile { get; set; }
+
+		/// <summary>
+		/// 邮箱
+		/// </summary>
+		public string EMail { get; set; }
+
+		/// <summary>
+		/// 法人
+		/// </summary>
+		public string LegalPerson { get; set; }
+
+		/// <summary>
+		/// 公司微信
+		/// </summary>
+		public string WechatNo { get; set; }
+
+		/// <summary>
+		/// 公司介绍
+		/// </summary>
+		public string CompanyIntro { get; set; }
+
+		/// <summary>
+		/// 官网
+		/// </summary>
+		public string DomainUrl { get; set; }
+
+		/// <summary>
+		/// 成立时间
+		/// </summary>
+		public DateTime? FoundingTime { get; set; }
+
+		/// <summary>
+		/// 员工人数
+		/// </summary>
+		public int EmployeeNum { get; set; }
+
+		/// <summary>
+		/// 年销售(万元)
+		/// </summary>
+		public decimal AnnualSales { get; set; }
+
+		/// <summary>
+		/// 年进口额
+		/// </summary>
+		public decimal AnnualImport { get; set; }
+
+		/// <summary>
+		/// 详细地址
+		/// </summary>
+		public string Address { get; set; }
+
+		/// <summary>
+		/// 详细地址(英文)
+		/// </summary>
+		public string EnAddress { get; set; }
+
+		/// <summary>
+		/// 行业
+		/// </summary>
+		public string Industry { get; set; }
+
+		/// <summary>
+		/// 主要出口国
+		/// </summary>
+		public string ExportCountry { get; set; }
+
+		/// <summary>
+		/// 主要进口国家
+		/// </summary>
+		public string ImportCountry { get; set; }
+
+		/// <summary>
+		/// 主要进口类目
+		/// </summary>
+		public string ImportCategory { get; set; }
+
+		/// <summary>
+		/// 其他内容
+		/// </summary>
+		public string OtherInfo { get; set; }
+
+		/// <summary>
+		/// 商户号id
+		/// </summary>
+		public int TenantId { get; set; }
+
+		/// <summary>
+		/// 小程序id
+		/// </summary>
+		public int MallBaseId { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateDate { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 修改时间
+		/// </summary>
+		public DateTime UpdateDate { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+	}
+}

Mall.Model/Entity/TradePavilion/RB_InvestmentProcurement.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+	/// <summary>
+	/// 投资采购实体类
+	/// </summary>
+	[Serializable]
+	[DB(ConnectionName = "DefaultConnection")]
+	public class RB_InvestmentProcurement
+	{
+		/// <summary>
+		/// 主键
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 类型（1-采购需求,2-投资意向）
+		/// </summary>
+		public int Type { get; set; }
+
+		/// <summary>
+		/// 商品类目
+		/// </summary>
+		public string GoodsCategory { get; set; }
+
+		/// <summary>
+		/// 投资意向
+		/// </summary>
+		public string Investment { get; set; }
+
+		/// <summary>
+		/// 进口数量
+		/// </summary>
+		public int? ImportNum { get; set; }
+
+		/// <summary>
+		/// 产品说明
+		/// </summary>
+		public string Describe { get; set; }
+
+		/// <summary>
+		/// 公司名称
+		/// </summary>
+		public string CompanyName { get; set; }
+
+		/// <summary>
+		/// 公司英文名称
+		/// </summary>
+		public string CompanyEnName { get; set; }
+
+		/// <summary>
+		/// 联系电话
+		/// </summary>
+		public string Mobile { get; set; }
+
+		/// <summary>
+		/// 邮箱
+		/// </summary>
+		public string EMail { get; set; }
+
+		/// <summary>
+		/// 法人
+		/// </summary>
+		public string LegalPerson { get; set; }
+
+		/// <summary>
+		/// 负责人
+		/// </summary>
+		public string Principal { get; set; }
+
+		/// <summary>
+		/// 微信号
+		/// </summary>
+		public string WechatNo { get; set; }
+
+		/// <summary>
+		/// 官网
+		/// </summary>
+		public string DomainUrl { get; set; }
+
+		/// <summary>
+		/// 行业
+		/// </summary>
+		public string Industry { get; set; }
+
+		/// <summary>
+		/// 成立时间
+		/// </summary>
+		public DateTime FoundingTime { get; set; }
+
+		/// <summary>
+		/// 员工人数
+		/// </summary>
+		public int? EmployeeNum { get; set; }
+
+		/// <summary>
+		/// 年销售(万元)
+		/// </summary>
+		public decimal? AnnualSales { get; set; }
+
+		/// <summary>
+		/// 详细地址
+		/// </summary>
+		public string Address { get; set; }
+
+		/// <summary>
+		/// 详细地址(英文)
+		/// </summary>
+		public string EnAddress { get; set; }
+
+		/// <summary>
+		/// 年进口额
+		/// </summary>
+		public decimal? AnnualImport { get; set; }
+
+		/// <summary>
+		/// 主要进口类目
+		/// </summary>
+		public string ImportCategory { get; set; }
+
+		/// <summary>
+		/// 主要进口国家
+		/// </summary>
+		public string ImportCountry { get; set; }
+
+		/// <summary>
+		/// 主要出口国
+		/// </summary>
+		public string ExportCountry { get; set; }
+
+		/// <summary>
+		/// 公司介绍
+		/// </summary>
+		public string CompanyIntro { get; set; }
+
+		/// <summary>
+		/// 其他内容
+		/// </summary>
+		public string OtherInfo { get; set; }
+
+		/// <summary>
+		/// 商户号id
+		/// </summary>
+		public int TenantId { get; set; }
+
+		/// <summary>
+		/// 小程序id
+		/// </summary>
+		public int MallBaseId { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateDate { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 修改时间
+		/// </summary>
+		public DateTime UpdateDate { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+	}
+}

Mall.Model/Extend/TradePavilion/RB_Company_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 公司信息扩展实体类
+    /// </summary>
+    public class RB_Company_Extend : RB_Company
+    {
+        /// <summary>
+        /// 成立时间字符串
+        /// </summary>
+        public string FoundingTimeStr
+        {
+            get
+            {
+                return Common.ConvertHelper.FormatDate(this.FoundingTime);
+            }
+        }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Procurement_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 投资采购扩展实体类
+    /// </summary>
+    public class RB_InvestmentProcurement_Extend : RB_InvestmentProcurement
+    {
+
+    }
+}

Mall.Module.Education/PointModule.cs

@@ -801,6 +801,41 @@ namespace Mall.Module.Education
         }
 
 
+
+
+        public bool DeleteCourseOrder(RB_Point_TeacherCourseOrder_Extend model)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>
+                {
+                    { nameof(RB_Point_TeacherCourseOrder_Extend.State),1 },
+                    { nameof(RB_Point_TeacherCourseOrder_Extend.UpdateDate), model.UpdateDate },
+                };
+            IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
+                    {
+                        new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_TeacherCourseOrder_Extend.ID),
+                            FiledValue = model.ID,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                         new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_TeacherCourseOrder_Extend.TenantId),
+                            FiledValue = model.TenantId,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                          new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_TeacherCourseOrder_Extend.MallBaseId),
+                            FiledValue = model.MallBaseId,
+                            OperatorEnum = OperatorEnum.Equal
+                        }
+                    };
+
+            return pointTeacherCourseOrderRepository.Update(fileds, auditrecordWhereHelpers);
+        }
+
+
         /// <summary>
         /// 确认订单
         /// </summary>
@@ -843,6 +878,7 @@ namespace Mall.Module.Education
                     };
 
                 flag = pointTeacherCourseOrderRepository.Update(fileds, auditrecordWhereHelpers, trans);
+              
                 if (flag)//推送房间信息
                 {
                     List<string> openidList = new List<string>();
@@ -850,7 +886,7 @@ namespace Mall.Module.Education
                     new MiniProgramMsgModule().SendCourseOrderTplMsg(model.TenantId, model.MallBaseId, openidList, model.CourseName, "老师：" + model.TeacherName + "时间：" + model.StudyDate.ToString("HH:mm"), model.StudyDate.ToString("MM月dd日"));
                 }
             }
-
+            pointTeacherCourseOrderRepository.DBSession.Commit();
             return flag;
         }
 
@@ -921,7 +957,8 @@ namespace Mall.Module.Education
                     {
                         allTotalPointNum = 0;
                     }
-                    else {
+                    else
+                    {
                         allTotalPointNum = (umodel.PointNum - allTotalPointNum);
                     }
                     memberBalanceModel.Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend;
@@ -930,7 +967,7 @@ namespace Mall.Module.Education
                 else if (model.ActualPointNum < model.TotalPointNum)
                 {
                     allTotalPointNum = model.TotalPointNum - model.ActualPointNum;
-                    allTotalPointNum = (umodel.PointNum +allTotalPointNum);
+                    allTotalPointNum = (umodel.PointNum + allTotalPointNum);
                     memberBalanceModel.Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income;
                     memberBalanceModel.Description = "购买直播课程退费" + (model.TotalPointNum - model.ActualPointNum) + "点";
                 }
@@ -963,6 +1000,8 @@ namespace Mall.Module.Education
                 member_UserRepository.Update(filedsUser, userWhereHelpers, trans);
 
             }
+
+            pointTeacherCourseOrderRepository.DBSession.Commit();
             return flag;
         }
 

Mall.Module.TradePavilion/CompanyModule.cs

+using Mall.Model.Extend.TradePavilion;
+using Mall.Repository.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Module.TradePavilion
+{
+    /// <summary>
+    /// 公司信息处理类
+    /// </summary>
+    public class CompanyModule
+    {
+        private readonly RB_CompanyRepository companyRepository = new RB_CompanyRepository();
+
+        /// <summary>
+        /// 获取公司信息分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Company_Extend> GetCompanyPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Company_Extend query)
+        {
+            return companyRepository.GetCompanyPageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 获取公司信息实体
+        /// </summary>
+        /// <param name="CompanyId"></param>
+        /// <returns></returns>
+        public RB_Company_Extend GetCompanyModule(object CompanyId)
+        {
+            return companyRepository.GetEntity<RB_Company_Extend>(CompanyId);
+        }
+
+        /// <summary>
+        /// 新增修改公司信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetCompanyModule(RB_Company_Extend model)
+        {
+            bool flag;
+            if (model.CompanyId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Company_Extend.CompanyName),model.CompanyName },
+                    {nameof(RB_Company_Extend.CompanyEnName),model.CompanyEnName },
+                    {nameof(RB_Company_Extend.Principal),model.Principal },
+                    {nameof(RB_Company_Extend.Mobile),model.Mobile },
+                    {nameof(RB_Company_Extend.EMail),model.EMail },
+                    {nameof(RB_Company_Extend.LegalPerson),model.LegalPerson },
+                    {nameof(RB_Company_Extend.WechatNo),model.WechatNo },
+                    {nameof(RB_Company_Extend.CompanyIntro),model.CompanyIntro },
+                    {nameof(RB_Company_Extend.DomainUrl),model.DomainUrl },
+                    {nameof(RB_Company_Extend.FoundingTime),model.FoundingTime },
+                    {nameof(RB_Company_Extend.EmployeeNum),model.EmployeeNum },
+                    {nameof(RB_Company_Extend.AnnualSales),model.AnnualSales },
+                    {nameof(RB_Company_Extend.AnnualImport),model.AnnualImport },
+                    {nameof(RB_Company_Extend.Address),model.Address },
+                    {nameof(RB_Company_Extend.EnAddress),model.EnAddress },
+                    {nameof(RB_Company_Extend.Industry),model.Industry },
+                    {nameof(RB_Company_Extend.ExportCountry),model.ExportCountry },
+                    {nameof(RB_Company_Extend.ImportCountry),model.ImportCountry },
+                    {nameof(RB_Company_Extend.ImportCategory),model.ImportCategory },
+                    {nameof(RB_Company_Extend.OtherInfo),model.OtherInfo },
+                    {nameof(RB_Company_Extend.UpdateBy),model.UpdateBy },
+                    {nameof(RB_Company_Extend.UpdateDate),model.UpdateDate },
+                };
+                flag = companyRepository.Update(fileds, new WhereHelper(nameof(RB_Company_Extend.CompanyId), model.CompanyId));
+            }
+            else
+            {
+                var newId = companyRepository.Insert(model);
+                model.CompanyId = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 更新公司信息状态
+        /// </summary>
+        /// <param name="CompanyId"></param>
+        /// <param name="Status"></param>
+        /// <returns></returns>
+        public bool RemoveCompanyModule(int CompanyId, int Status)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Company_Extend.Status),Status },
+            };
+            bool flag = companyRepository.Update(fileds, new WhereHelper(nameof(RB_Company_Extend.CompanyId), CompanyId));
+            return flag;
+        }
+    }
+}

Mall.Module.TradePavilion/ContractModule.cs

@@ -18,7 +18,7 @@ namespace Mall.Module.TradePavilion
         private readonly RB_ContractRepository contractRepository = new RB_ContractRepository();
 
         /// <summary>
-        /// 获取联系人人也列表
+        /// 获取联系分页列表
         /// </summary>
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>

Mall.Module.TradePavilion/InvestmentProcurementModule.cs

+using Mall.Model.Extend.TradePavilion;
+using Mall.Repository.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Module.TradePavilion
+{
+    /// <summary>
+    /// 投资采购处理类
+    /// </summary>
+    public class InvestmentProcurementModule
+    {
+        /// <summary>
+        /// 投资采购仓储层对象
+        /// </summary>
+        private readonly RB_InvestmentProcurementRepository repository = new RB_InvestmentProcurementRepository();
+
+        /// <summary>
+        /// 获取投资采购分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_InvestmentProcurement_Extend> GetInvestmentProcurementPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_InvestmentProcurement_Extend query)
+        {
+            return repository.GetInvestmentProcurementPageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 获取投资采购实体
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_InvestmentProcurement_Extend GetInvestmentProcurementModule(object Id)
+        {
+            return repository.GetEntity<RB_InvestmentProcurement_Extend>(Id);
+        }
+
+        /// <summary>
+        /// 新增修改投资采购
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetInvestmentProcurementModule(RB_InvestmentProcurement_Extend model)
+        {
+            bool flag;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_InvestmentProcurement_Extend.Type),model.Type },
+                    {nameof(RB_InvestmentProcurement_Extend.GoodsCategory),model.GoodsCategory },
+                    {nameof(RB_InvestmentProcurement_Extend.Investment),model.Investment },
+                    {nameof(RB_InvestmentProcurement_Extend.ImportNum),model.ImportNum },
+                    {nameof(RB_InvestmentProcurement_Extend.Describe),model.Describe },
+                    {nameof(RB_InvestmentProcurement_Extend.CompanyName),model.CompanyName },
+                    {nameof(RB_InvestmentProcurement_Extend.CompanyEnName),model.CompanyEnName },
+                    {nameof(RB_InvestmentProcurement_Extend.Mobile),model.Mobile },
+                    {nameof(RB_InvestmentProcurement_Extend.EMail),model.EMail },
+                    {nameof(RB_InvestmentProcurement_Extend.LegalPerson),model.LegalPerson },
+                    {nameof(RB_InvestmentProcurement_Extend.Principal),model.Principal },
+                    {nameof(RB_InvestmentProcurement_Extend.WechatNo),model.WechatNo },
+                    {nameof(RB_InvestmentProcurement_Extend.DomainUrl),model.DomainUrl },
+                    {nameof(RB_InvestmentProcurement_Extend.Industry),model.Industry },
+                    {nameof(RB_InvestmentProcurement_Extend.FoundingTime),model.FoundingTime },
+                    {nameof(RB_InvestmentProcurement_Extend.EmployeeNum),model.EmployeeNum },
+                    {nameof(RB_InvestmentProcurement_Extend.AnnualSales),model.AnnualSales },
+                    {nameof(RB_InvestmentProcurement_Extend.Address),model.Address },
+                    {nameof(RB_InvestmentProcurement_Extend.EnAddress),model.EnAddress },
+                    {nameof(RB_InvestmentProcurement_Extend.AnnualImport),model.AnnualImport },
+                    {nameof(RB_InvestmentProcurement_Extend.ImportCategory),model.ImportCategory },
+                    {nameof(RB_InvestmentProcurement_Extend.ImportCountry),model.ImportCountry },
+                    {nameof(RB_InvestmentProcurement_Extend.ExportCountry),model.ExportCountry },
+                    {nameof(RB_InvestmentProcurement_Extend.CompanyIntro),model.CompanyIntro },
+                    {nameof(RB_InvestmentProcurement_Extend.OtherInfo),model.OtherInfo },
+                    {nameof(RB_InvestmentProcurement_Extend.UpdateBy),model.UpdateBy },
+                    {nameof(RB_InvestmentProcurement_Extend.UpdateDate),model.UpdateDate },
+                };
+                flag = repository.Update(fileds, new WhereHelper(nameof(RB_InvestmentProcurement_Extend.Id), model.Id));
+            }
+            else
+            {
+                var newId = repository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 更新投资采购状态
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="Status"></param>
+        /// <returns></returns>
+        public bool RemoveInvestmentProcurementModule(int Id, int Status)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_InvestmentProcurement_Extend.Status),Status },
+            };
+            bool flag = repository.Update(fileds, new WhereHelper(nameof(RB_InvestmentProcurement_Extend.Id), Id));
+            return flag;
+        }
+
+    }
+}

Mall.Repository/TradePavilion/RB_CompanyRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 公司信息仓储层
+    /// </summary>
+    public class RB_CompanyRepository: BaseRepository<RB_Company>
+    {
+        /// <summary>
+        /// 获取公司信息分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Company_Extend> GetCompanyPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Company_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Company
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Company_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Company_Extend.CompanyName));
+                    parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
+                }
+            }
+            return GetPage<RB_Company_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_ContractRepository.cs

@@ -15,7 +15,7 @@ namespace Mall.Repository.TradePavilion
     public class RB_ContractRepository : BaseRepository<RB_Contract>
     {
         /// <summary>
-        /// 获取联系人人也列表
+        /// 获取联系分页列表
         /// </summary>
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>

Mall.Repository/TradePavilion/RB_InvestmentProcurementRepository.cs

+
+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 投资采购仓储层
+    /// </summary>
+    public class RB_InvestmentProcurementRepository : BaseRepository<RB_InvestmentProcurement>
+    {
+        /// <summary>
+        /// 获取投资采购分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_InvestmentProcurement_Extend> GetInvestmentProcurementPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_InvestmentProcurement_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_InvestmentProcurement
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_InvestmentProcurement_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_InvestmentProcurement_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_InvestmentProcurement_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Company_Extend.CompanyName));
+                    parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
+                }
+            }
+            return GetPage<RB_InvestmentProcurement_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Education/AppletPointController.cs

@@ -273,6 +273,35 @@ namespace Mall.WebApi.Controllers.Education
                 Id = Convert.ToInt32(x.Value)
             }));
         }
+
+        /// <summary>
+        /// 获取订单详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDeletePointOrderInfo()
+        {
+            var userInfo = AppletUserInfo;
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            if (OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递订单id");
+            }
+            var model = pointModule.GetPointOrderInfo(OrderId, userInfo.TenantId);
+            if (model == null) { return ApiResult.Failed("订单不存在"); }
+            if (model.UserId != userInfo.UserId) { return ApiResult.Failed("不是你的订单，无法操作"); }
+            model.UpdateDate = System.DateTime.Now;
+            bool retult = pointModule.DeleteCourseOrder(model);
+            if (retult)
+            {
+                return ApiResult.Success("订单删除成功");
+            }
+            else
+            {
+                return ApiResult.Success("订单删除失败");
+            }
+        }
         #endregion
 
         #region 课程订单下单
@@ -393,7 +422,7 @@ namespace Mall.WebApi.Controllers.Education
                         return ApiResult.Failed("预约结束时间不能大于课程预约结束时间");
                     }
 
-                    foreach (var item in orderList)
+                    foreach (var item in orderList.Where(x => x.ID != query.ID))
                     {
                         DateTime endTime = item.StudyDate;
 
@@ -625,12 +654,13 @@ namespace Mall.WebApi.Controllers.Education
                 {
                     updateList = oldcourseOrderList.Where(x => x.OrderStaus == Common.Enum.Point.OrderStausEnum.Paid).ToList();
                 }
-                if (updateList == null || updateList.Any())
+                if (updateList == null || !updateList.Any())
                 {
                     return ApiResult.Failed("订单已确认");
                 }
                 updateList.ForEach(x => x.OrderStaus = Common.Enum.Point.OrderStausEnum.NoClass);
                 updateList.ForEach(x => x.UpdateDate = System.DateTime.Now);
+                updateList.ForEach(x => x.RoomInfo = query.RoomInfo);
 
                 bool result = pointModule.ConfirmTeacherCourseOrder(updateList);
                 if (result)
@@ -683,11 +713,11 @@ namespace Mall.WebApi.Controllers.Education
                 bool result = pointModule.CompleteTeacherCourseOrder(oldModel);
                 if (result)
                 {
-                    return ApiResult.Success("订单确认成功");
+                    return ApiResult.Success("订单完成操作成功");
                 }
                 else
                 {
-                    return ApiResult.Failed("订单确认失败");
+                    return ApiResult.Failed("订单完成操作失败");
                 }
             }
         }
@@ -801,6 +831,7 @@ namespace Mall.WebApi.Controllers.Education
                 model.TeacherName,
                 model.CourseName,
                 model.RoomId,
+                model.DurationUnit,
                 StudyDateStr = model.StudyDate.ToString("yyyy-MM-dd"),
                 orderList,
                 StudentNumTypeName = EnumHelper.GetEnumName(model.StudentNumType)
@@ -830,7 +861,7 @@ namespace Mall.WebApi.Controllers.Education
             if (oldPointGoodsList != null && oldPointGoodsList.Any())
             {
                 string courseIds = string.Join(",", oldPointGoodsList.Select(x => x.ID));
-                courseOrder = pointModule.GetPointOrderList(new RB_Point_TeacherCourseOrder_Extend { SelectOrderStatus = 1, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, CourseIds = courseIds, UserId = userInfo.UserId });
+                courseOrder = pointModule.GetPointOrderList(new RB_Point_TeacherCourseOrder_Extend { SelectOrderStatus = 1, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, CourseIds = courseIds });
             }
 
             if (oldPointGoodsList != null && oldPointGoodsList.Any())
@@ -853,13 +884,13 @@ namespace Mall.WebApi.Controllers.Education
 
                 foreach (var item in nowDayList)
                 {
-                    var nowCourseOrderList = courseOrder.Where(x => item.ID == x.CourseId);
+                    var nowCourseOrderList = courseOrder.Where(x => item.ID == x.CourseId && x.UserId == userInfo.UserId);
                     haveCourseCount += nowCourseOrderList.Count();
 
                     List<object> orderList = new List<object>();
                     if (nowCourseOrderList != null && nowCourseOrderList.Any())
                     {
-                        orderList.AddRange(nowCourseOrderList.Select(x => new { x.UserName, x.Photo, StartStudyDate = x.StudyDate.ToString("HH:mm"), EndStudyDate = x.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour ? (x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration * 60))) : x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration)) }));
+                        orderList.AddRange(nowCourseOrderList.Select(x => new { x.UserName, x.Photo, StartStudyDate = x.StudyDate.ToString("HH:mm"), EndStudyDate = (x.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour ? (x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration * 60))) : x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration))).ToString("HH:mm") }));
                     }
                     planList.Add(new
                     {

Mall.WebApi/Controllers/TradePavilion/ContractController.cs → Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -20,13 +20,24 @@ namespace Mall.WebApi.Controllers.TradePavilion
     [ApiExceptionFilter]
     [ApiController]
     [EnableCors("AllowCors")]
-    public class ContractController : BaseController
+    public class TradeController : BaseController
     {
         /// <summary>
         /// 联系人处理类对象
         /// </summary>
         private readonly ContractModule module = new ContractModule();
 
+        /// <summary>
+        /// 投资采购处理类对象
+        /// </summary>
+        private readonly InvestmentProcurementModule procurementModule = new InvestmentProcurementModule();
+
+        /// <summary>
+        /// 公司信息处理类对象
+        /// </summary>
+        private readonly CompanyModule companyModule = new CompanyModule();
+
+        #region 联系人管理
 
         /// <summary>
         /// 获取联系人分页列表
@@ -95,5 +106,133 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var flag = module.RemoveContractModule(Id, Status);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        #endregion
+
+        #region 投资采购管理
+
+        /// <summary>
+        /// 获取投资采购分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetInvestmentProcurementPage()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            var query = JsonConvert.DeserializeObject<RB_InvestmentProcurement_Extend>(RequestParm.msg.ToString());
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = procurementModule.GetInvestmentProcurementPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 新增修改投资采购
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetInvestmentProcurement()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_InvestmentProcurement_Extend>(RequestParm.msg.ToString());
+            extModel.Status = Common.Enum.DateStateEnum.Normal;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            Int32.TryParse(RequestParm.uid, out int Uid);
+            extModel.CreateBy = Uid;
+            extModel.CreateDate = DateTime.Now;
+            extModel.UpdateBy = Uid;
+            extModel.UpdateDate = DateTime.Now;
+            var flag = procurementModule.SetInvestmentProcurementModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取投资采购详情
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetInvestmentProcurement()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var extModel = procurementModule.GetInvestmentProcurementModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 删除投资采购信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveInvestmentProcurement()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var Status = parms.GetInt("Status", 0);
+            var flag = procurementModule.RemoveInvestmentProcurementModule(Id, Status);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion
+
+        #region 公司信息管理
+
+        /// <summary>
+        /// 获取公司信息分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCompanyPageList()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            var query = JsonConvert.DeserializeObject<RB_Company_Extend>(RequestParm.msg.ToString());
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = companyModule.GetCompanyPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 新增修改公司信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetCompany()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_Company_Extend>(RequestParm.msg.ToString());
+            extModel.Status = Common.Enum.DateStateEnum.Normal;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            Int32.TryParse(RequestParm.uid, out int Uid);
+            extModel.CreateBy = Uid;
+            extModel.CreateDate = DateTime.Now;
+            extModel.UpdateBy = Uid;
+            extModel.UpdateDate = DateTime.Now;
+            var flag = companyModule.SetCompanyModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取公司信息详情
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCompany()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CompanyId = parms.GetInt("CompanyId", 0);
+            var extModel = companyModule.GetCompanyModule(CompanyId);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 删除公司信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveCompany()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CompanyId = parms.GetInt("CompanyId", 0);
+            var Status = parms.GetInt("Status", 0);
+            var flag = companyModule.RemoveCompanyModule(CompanyId, Status);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion
     }
 }