解决冲突

Mall.Model/Entity/Education/RB_Education_Article.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    ///  教育-资讯管理实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Article
+    {
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+
+        /// <summary>
+        /// 资讯状态   1上架  2下架
+        /// </summary>        
+        public int? ArticleStatus
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 自动上架时间
+        /// </summary>
+        public DateTime? ShelvesDate { get; set; }
+
+        /// <summary>
+        /// 自动下架时间
+        /// </summary>
+        public DateTime? DownDate { get; set; }
+
+        /// <summary>
+        /// 虚拟浏览数量
+        /// </summary>        
+        public int FictitiousBrowseNum
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 浏览数
+        /// </summary>        
+        public int BrowseNum
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+
+        public string LableName { get; set; }
+
+
+        /// <summary>
+        /// 是否可以留言，0-否，1-是
+        /// </summary>
+        public int IsComment { get; set; }
+
+
+        /// <summary>
+        /// 资讯内容
+        /// </summary>
+        public string Describe { get; set; }
+
+
+       
+    }
+}

Mall.Model/Entity/Education/RB_Education_ArticleComment.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum.Goods;
+using Mall.Common.Enum.User;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    ///  教育-资讯评论管理实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_ArticleComment
+    {
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+
+
+        /// <summary>
+        /// 用户id
+        /// </summary>        
+        public int? UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 资讯id
+        /// </summary>        
+        public int ArticleId
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 客人名称
+        /// </summary>        
+        public string UserName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户头像
+        /// </summary>        
+        public int? UserPhoto
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评论类型  1 好评  2中评   3差评
+        /// </summary>        
+        public GoodsCommentTypeEnum? CommentGrade
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评分 1-5分
+        /// </summary>
+        public int? CommentScore { get; set; }
+
+
+        /// <summary>
+        /// 评论内容
+        /// </summary>        
+        public string Content
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评论图片
+        /// </summary>        
+        public string CommentImage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 回复
+        /// </summary>        
+        public string Reply
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 来源
+        /// </summary>        
+        public UserSourceEnum? PlatformSource
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否置顶  1是  2否
+        /// </summary>        
+        public int? Is_Top
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否显示   1是  2否
+        /// </summary>        
+        public int? Is_Show
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否匿名  1是  2否
+        /// </summary>        
+        public int? Is_Anonymity
+        {
+            get;
+            set;
+        }
+
+
+    }
+}

Mall.Model/Entity/Education/RB_Education_Coupon.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    ///  教育-课程卡实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Coupon
+    {
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+        public string Name { get; set; }
+
+        public string CouponIco { get; set; }
+
+
+        /// <summary>
+        /// 领取方式设置1-领劵中心
+        /// </summary>
+        public int PickupCenter { get; set; }
+
+        /// <summary>
+        /// 店铺id
+        /// </summary>
+        public int SmallShopId { get; set; }
+
+
+        /// <summary>
+        /// 是否赞羊使用0-否，1-是
+        /// </summary>
+        public int IsZanYangUse { get; set; }
+
+        /// <summary>
+        /// 有效期类型，1-领取后N天内有效，2-时间段
+        /// </summary>
+        public IndateTypeEnum IndateType { get; set; }
+
+
+        /// <summary>
+        /// 有效天数
+        /// </summary>
+        public int IndateDay { get; set; }
+
+        /// <summary>
+        /// 总核销次数
+        /// </summary>
+        public int HeXiao { get; set; }
+
+        /// <summary>
+        /// 可发放数量,-1 无限制
+        /// </summary>
+        public int TotalNum { get; set; }
+
+
+
+        /// <summary>
+        /// 1-指定商品类型，2-指定商品，3-全场通用，4-当面付
+        /// </summary>
+        public UseTypeEnum UseType { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Describe { get; set; }
+
+
+        /// <summary>
+        /// 领取数量
+        /// </summary>
+        public int ReceiveNum { get; set; }
+
+        /// <summary>
+        /// 有效期开始时间
+        /// </summary>
+        public DateTime? StartDate { get; set; }
+
+        /// <summary>
+        /// 有效期结束时间
+        /// </summary>
+        public DateTime? EndDate { get; set; }
+    }
+}

Mall.Model/Entity/Education/RB_Education_CouponProduct.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 优惠券指定商品/分类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_CouponProduct
+    {  /// <summary>
+       /// 卡劵id
+       /// </summary>
+        public int CouponId { get; set; }
+
+        /// <summary>
+        /// 商品/分类id
+        /// </summary>
+        public int ProductId { get; set; }
+
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public UseTypeEnum DiscountCouponType { get; set; }
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+    }
+}

Mall.Model/Entity/Education/RB_Education_CouponSelfMotion.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 自动发放优惠券
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_CouponSelfMotion
+    {
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 触发事件，1-分享，2-购买并付款，3-新人领券
+        /// </summary>
+        public TriggerTypeEnum TriggerType { get; set; }
+
+
+        /// <summary>
+        /// 优惠券id
+        /// </summary>
+        public int DiscountCouponId { get; set; }
+
+
+        /// <summary>
+        /// 发放次数，0-无限制
+        /// </summary>
+        public int GrantNum { get; set; }
+
+        /// <summary>
+        /// 0-所有人，1-指定用户
+        /// </summary>
+        public int IsAll { get; set; }
+    }
+}

Mall.Model/Entity/Education/RB_Education_CouponSelfMotionMember.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 自动发放优惠券-指定会员
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_CouponSelfMotionMember
+    {
+        /// <summary>
+        /// 自动发放id
+        /// </summary>
+        public int SelfMotionId { get; set; }
+
+        /// <summary>
+        /// 会员id
+        /// </summary>
+        public int UserId { get; set; }
+
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+
+        public DateTime UpdateDate { get; set; }
+    }
+}

Mall.Model/Entity/Education/RB_Education_MemberCoupon.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 会员课程卡劵实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_MemberCoupon
+
+    {
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int? UserId { get; set; }
+
+
+        /// <summary>
+        /// 描述
+        /// </summary>        
+        public string Description
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 领取时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号id
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
+
+
+
+        /// <summary>
+        /// 优惠券id
+        /// </summary>
+        public int CouponId { get; set; }
+
+
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime? StartDate { get; set; }
+
+        /// <summary>
+        /// 总核销次数
+        /// </summary>
+        public int HeXiao { get; set; }
+
+        /// <summary>
+        /// 已使用核销数
+        /// </summary>
+        public int UseHeXiao { get; set; }
+
+        public DateTime? EndDate { get; set; }
+
+
+        /// <summary>
+        /// 领取方式0-自行领取（领劵中心领取），1-分享，2-购买并付款，3-新人领取,4-新人购买并付款
+        /// </summary>
+        public new int GetType { get; set; }
+
+
+
+        /// <summary>
+        /// 1-指定商品类型，2-指定商品，3-全场通用，4-当面付
+        /// </summary>
+        public UseTypeEnum UseType { get; set; }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public int Status { get; set; }
+
+
+        /// <summary>
+        /// 优惠券名称
+        /// </summary>
+        public string Name { get; set; }
+
+
+
+
+    }
+}

Mall.Model/Entity/Education/RB_Education_MemberUseCoupon.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 会员使用课程卡劵实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_MemberUseCoupon
+
+    {
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int? UserId { get; set; }
+
+
+        /// <summary>
+        /// 用户优惠券id
+        /// </summary>
+        public int? MemberCouponId { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
+
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 使用时间
+        /// </summary>
+        public DateTime? UseDate { get; set; }
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public int OrderId { get; set; }
+    }
+}

Mall.Model/Entity/Education/RB_Education_Teacher.cs

+using Mall.Common.Enum.GuideCar;
+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_Teacher
+    {
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string TeacherLogo { get; set; }
+
+
+        /// <summary>
+        /// 专业
+        /// </summary>
+        public string Major { get; set; }
+        /// <summary>
+        /// 状态1上架  2下架
+        /// </summary>
+        public int TeacherStatus { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Telephone { get; set; }
+
+     
+
+        /// <summary>
+        /// 简介
+        /// </summary>
+        public string Introduction { get; set; }
+
+        /// <summary>
+        /// 用户评分
+        /// </summary>
+        public decimal Score { get; set; }
+
+
+    }
+}

Mall.Model/Extend/Education/RB_Education_ArticleComment_Extend.cs

+using Mall.Model.Entity.Education;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 资讯评论
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_ArticleComment_Extend : RB_Education_ArticleComment
+    {
+        /// <summary>
+        /// 资讯标题
+        /// </summary>
+        public string ArticleName { get; set; }
+    }
+}
\ No newline at end of file

Mall.Model/Extend/Education/RB_Education_Article_Extend.cs

+using Mall.Model.Entity.Education;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    ///  教育-资讯管理扩展表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Article_Extend : RB_Education_Article
+    {
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 评论数
+        /// </summary>
+        public int CommentNum { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_CSelfMotionMember_Extend.cs

+using VT.FW.DB;
+using System;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 自动发放优惠券-指定会员扩展表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_CSelfMotionMember_Extend : RB_Education_CouponSelfMotionMember
+    {
+        /// <summary>
+        /// 会员名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 会员头像
+        /// </summary>
+        public string Photo { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_CSelfMotion_Extend.cs

+using VT.FW.DB;
+using Mall.Model.Entity.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 自动发放优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_CSelfMotion_Extend : RB_Education_CouponSelfMotion
+    {
+
+        public List<RB_Education_CSelfMotionMember_Extend> UserList { get; set; }
+
+        /// <summary>
+        /// 优惠券名字
+        /// </summary>
+        public string DiscountCouponName { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_CouponProduct_Extend.cs

+using Mall.Model.Entity.Education;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 教育-课程卡关联的商品/分类扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_CouponProduct_Extend: RB_Education_CouponProduct
+    {
+        /// <summary>
+        /// 关联信息（商品图片/分类名称）
+        /// </summary>
+        public string Relevance { get; set; }
+
+        /// <summary>
+        /// 商品价格（下单获取优惠券）
+        /// </summary>
+        public decimal GoodsPrice { get; set; }
+
+        /// <summary>
+        /// 商品分类id
+        /// </summary>
+        public int[] GoodsClassId { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_Coupon_Extend.cs

+using Mall.Model.Entity.Education;
+using System;
+using System.Collections.Generic;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Coupon_Extend: RB_Education_Coupon
+    {
+        /// <summary>
+        /// 商品/分类id
+        /// </summary>
+        public List<RB_Education_CouponProduct_Extend> ProductList { get; set; }
+
+        /// <summary>
+        /// 发放优惠券的时候会员ids
+        /// </summary>
+        public string UserIds { get; set; }
+
+        /// <summary>
+        /// 0-未领取 >0已领取
+        /// </summary>
+        public int MemberNum { get; set; }
+
+        /// <summary>
+        /// 发放数量
+        /// </summary>
+        public int GrantNum { get; set; }
+
+        /// <summary>
+        /// 触发事件，1-分享，2-购买并付款，3-新人领券
+        /// </summary>
+        public int TriggerType { get; set; }
+        /// <summary>
+        /// 优惠卷ids
+        /// </summary>
+        public string CouponIds { get; set; }
+
+        /// <summary>
+        /// 会员等级
+        /// </summary>
+        public int[] MemberLevelList { get; set; }
+
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public int OrderId { get; set; }
+
+
+        /// <summary>
+        /// 发放优惠券的时候会员id
+        /// </summary>
+        public int UserId { get; set; }
+
+
+        /// <summary>
+        /// 使用状态 0-未使用，1:已使用，2:已过期
+        /// </summary>
+        public int UseState { get; set; }
+
+
+
+       
+
+        /// <summary>
+        /// 已使用核销数
+        /// </summary>
+        public int UseHeXiao { get; set; }
+        /// <summary>
+        /// 会员优惠券id
+        /// </summary>
+        public int MemberCouponId { get; set; }
+
+        /// <summary>
+        /// 商品
+        /// </summary>
+        public int[] GoodsIds { get; set; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public int[] CategoryIds { get; set; }
+
+
+        /// <summary>
+        /// 领劵中心领取
+        /// </summary>
+        public new int GetType { get; set; }
+
+
+        /// <summary>
+        /// 微店名称
+        /// </summary>
+        public string SmallShopName { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_MemberCoupon_Extend.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using Mall.Common.Enum.User;
+using Mall.Model.Entity.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 会员优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_MemberCoupon_Extend : RB_Education_MemberCoupon
+    {
+        public int PlatformType { get; set; }
+
+
+        public string CouponIco { get; set; }
+
+        /// <summary>
+        /// 下单时间
+        /// </summary>
+        public DateTime? OrderCreateDate { get; set; }
+
+        /// <summary>
+        /// 使用时间列表
+        /// </summary>
+        public List<RB_Education_MemberUseCoupon> MemberUseCouponList { get; set; }
+
+        /// <summary>
+        /// 会员昵称
+        /// </summary>
+        public string AliasName { get; set; }
+
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
+
+        /// <summary>
+        /// 优惠卷ids
+        /// </summary>
+        public string CouponIds { get; set; }
+        /// <summary>
+        /// 用户优惠券id
+        /// </summary>
+        public string Ids { get; set; }
+
+
+
+
+
+
+    }
+}

Mall.Model/Extend/Education/RB_Education_Teacher_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 网课-教师扩展表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Teacher_Extend: Entity.Education.RB_Education_Teacher
+    {
+
+        /// <summary>
+        /// 订单数
+        /// </summary>
+        public int OrderNum { get; set; }
+
+        /// <summary>
+        /// 订单人数
+        /// </summary>
+        public int OrderGuestNum { get; set; }
+
+        /// <summary>
+        /// 商品数
+        /// </summary>
+        public int GoodsNum { get; set; }
+
+        /// <summary>
+        /// 关联商品
+        /// </summary>
+        public List<Product.RB_Goods_Extend> GoodsList { get; set; }
+    }
+}

Mall.Module.Education/Mall.Module.Education.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Mall.Common\Mall.Common.csproj" />
+    <ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
+    <ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
+  </ItemGroup>
+
+</Project>

Mall.Module.Product/GuideCarModule.cs

@@ -3898,7 +3898,8 @@ namespace Mall.Module.Product
                     x.GuideTelephone,
                     x.GuideWorkYears,
                     x.CarId,
-                    x.GuideId
+                    x.GuideId,
+                    x.OrderId
                 }),
                 model.IsApplyForCancel,
                 model.RejectRemark,

Mall.Module.Product/OrderModule.cs

@@ -884,7 +884,8 @@ namespace Mall.Module.Product
                 model.IsApplyForCancel,
                 model.RejectRemark,
                 model.IsCanApplyForAfterSale,
-                model.PresentFXGrade
+                model.PresentFXGrade,
+                model.Remark
             });
         }
 

Mall.Repository/Education/RB_Education_ArticleCommentRepository.cs

+using Mall.Model.Entity.Education;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Repository.Education
+{
+    /// <summary>
+    /// 资讯评论仓储层
+    /// </summary>
+    public class RB_Education_ArticleCommentRepository : BaseRepository<RB_Education_ArticleComment>
+    {
+
+    }
+}

Mall.Repository/Education/RB_Education_ArticleRepository.cs

+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Education
+{
+    /// <summary>
+    /// 仓储层
+    /// </summary>
+    public class RB_Education_ArticleRepository : BaseRepository<RB_Education_Article>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Education_Article); } }
+        /// <summary>
+        /// 网课-老师列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_Article_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Education_Article_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Education_Article_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.ID)}={query.ID}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.Name)} like '%{query.Name}%'");
+                }
+                if (query.ArticleStatus > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.ArticleStatus)}={query.ArticleStatus}");
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.Append($"   and g.{nameof(RB_Education_Article_Extend.CreateDate)} >='{query.StartTime}'");
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.Append($"  and g.{nameof(RB_Education_Article_Extend.CreateDate)} <='{query.EndTime + " 23:59:59"}'");
+                }
+            }
+            return GetPage<RB_Education_Article_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 网课-老师列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_Article_Extend> GetTeacherList(RB_Education_Article_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Education_Article_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.ID)}={query.ID}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.Name)} like '%{query.Name}%'");
+                }
+                if (query.ArticleStatus > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Article_Extend.ArticleStatus)}={query.ArticleStatus}");
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.Append($"   and g.{nameof(RB_Education_Article_Extend.CreateDate)} >='{query.StartTime}'");
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.Append($"  and g.{nameof(RB_Education_Article_Extend.CreateDate)} <='{query.EndTime + " 23:59:59"}'");
+                }
+            }
+            return Get<RB_Education_Article_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_CouponProductRepository.cs

+using Mall.Model.Entity.Education;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.Education;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_CouponProductRepository : BaseRepository<RB_Education_CouponProduct>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Education_CouponProduct); } }
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string PCategoryTableName { get { return nameof(Model.Entity.Product.RB_Product_Category); } }
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string GoodsTableName { get { return nameof(Model.Entity.Product.RB_Goods); } }
+
+        /// <summary>
+        /// 优惠券对应的商品/分类列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_CouponProduct> GetCouponProductList(RB_Education_CouponProduct query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Education_CouponProduct.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_CouponProduct.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_CouponProduct.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_CouponProduct.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.CouponId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_CouponProduct.CouponId)}={query.CouponId}");
+                }
+            }
+            return Get<RB_Education_CouponProduct>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 优惠券对应的商品/分类列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_CouponProduct_Extend> GetListByDiscountCouponIds(RB_Education_Coupon query, string DiscountCouponIds,bool IsSelectDel =false)
+        {
+            StringBuilder builder = new StringBuilder();
+
+            if (query != null)
+            {
+                
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CouponProduct.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CouponProduct.MallBaseId)}={query.MallBaseId}");
+                }
+            }
+            if (!string.IsNullOrWhiteSpace(DiscountCouponIds))
+            {
+                builder.Append($" AND a.{nameof(RB_Education_CouponProduct.CouponId)} in ({DiscountCouponIds})");
+            }
+            string sql = "";
+            if (IsSelectDel)
+            {
+                sql = $"SELECT a.* from {TableName} as a  WHERE 1=1 ";
+            }
+            else {
+                sql = $"SELECT a.* from {TableName} as a  WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builder.ToString()}  ";
+            }            
+            if (query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Category)
+            {
+                sql = $" SELECT a.*,b.`Name` as Relevance from {TableName} as a LEFT JOIN {PCategoryTableName} as b on a.ProductId=b.Id WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builder.ToString()} ";
+            }
+            else if (query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Product)
+            {
+                sql = $" SELECT a.*,b.`Name` as Relevance from {TableName} as a LEFT JOIN {GoodsTableName} as b on a.ProductId=b.Id WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builder.ToString()} ";
+            }
+            return Get<RB_Education_CouponProduct_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_CouponSelfMotionMemberRepository.cs

+using Mall.Model.Entity.Education;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.Education;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_CouponSelfMotionMemberRepository : BaseRepository<RB_Education_CouponSelfMotionMember>
+    {
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Education_CouponSelfMotionMember); } }
+
+        // <summary>
+        /// 表名称
+        /// </summary>
+        public string UserTableName { get { return nameof(RB_Member_User); } }
+
+        /// <summary>
+        /// 获取发放优惠券的人员信息
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_CSelfMotionMember_Extend> GetListRepository(RB_Education_CSelfMotionMember_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@$" SELECT a.*,b.`Name`,b.Photo  FROM {TableName} as a 
+LEFT JOIN {UserTableName} as b on a.UserId = b.ID WHERE   a.{nameof(RB_Education_CSelfMotionMember_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CSelfMotionMember_Extend.TenantId)}={query.TenantId}");
+                }
+
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CSelfMotionMember_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.SelfMotionId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CSelfMotionMember_Extend.SelfMotionId)}={query.SelfMotionId}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CSelfMotionMember_Extend.UserId)}={query.UserId}");
+                }
+
+                //if (!string.IsNullOrWhiteSpace(query.PriceIds))
+                //{
+                //    builder.Append($" AND a.{nameof(RB_Education_CSelfMotionMember_Extend.RulesPriceId)} in ({query.PriceIds})");
+                //}
+            }
+            return Get<RB_Education_CSelfMotionMember_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_CouponSelfMotionRepository.cs

+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Education
+{
+  public  class RB_Education_CouponSelfMotionRepository:BaseRepository<RB_Education_CouponSelfMotion>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Education_CouponSelfMotion); } }
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string discountCouponTableName { get { return nameof(RB_Education_Coupon); } }
+        /// <summary>
+        /// 自动发放优惠券规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_CSelfMotion_Extend> GetSelfMotionPageLis(int pageIndex, int pageSize, out long rowCount, RB_Education_CSelfMotion_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@$" SELECT a.*,b.`Name` as DiscountCouponName from {TableName} as a LEFT JOIN {discountCouponTableName} as b
+on a.DiscountCouponId = b.ID WHERE  a.{nameof(RB_Education_CSelfMotion_Extend.Status)}=0");
+            if (query != null)
+            {
+                // where += $@" and {nameof(RB_Customer_InfoCreate.CustomerId)}={dmodel.CustomerId}";
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CSelfMotion_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CSelfMotion_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.DiscountCouponId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_CSelfMotion_Extend.DiscountCouponId)}={query.DiscountCouponId}");
+                }
+            }
+            return GetPage<RB_Education_CSelfMotion_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 自动发放优惠券规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_CSelfMotion_Extend> GettRepositoryList(RB_Education_CSelfMotion_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Education_CSelfMotion_Extend.Status)}=0 ");
+            if (query != null)
+            {
+                if (query != null)
+                {
+                    // where += $@" and {nameof(RB_Customer_InfoCreate.CustomerId)}={dmodel.CustomerId}";
+                    if (query.TenantId > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Education_CSelfMotion_Extend.TenantId)}={query.TenantId}");
+                    }
+                    if (query.ID > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Education_CSelfMotion_Extend.ID)}={query.ID}");
+                    }
+                    if (query.TenantId > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Education_CSelfMotion_Extend.MallBaseId)}={query.MallBaseId}");
+                    }
+                    if (query.DiscountCouponId > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Education_CSelfMotion_Extend.DiscountCouponId)}={query.DiscountCouponId}");
+                    }
+                }
+            }
+            return Get<RB_Education_CSelfMotion_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_MemberCouponRepository.cs

+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Education
+{
+    public  class RB_Education_MemberCouponRepository : BaseRepository<RB_Education_MemberCoupon>
+    {
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Education_MemberCoupon); } }
+
+
+
+        /// <summary>
+        /// 会员优惠券
+        /// </summary>
+        /// <returns></returns>
+        public List<RB_Education_MemberCoupon_Extend> GetList(RB_Education_MemberCoupon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberCoupon_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberCoupon_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.PlatformType > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberCoupon_Extend.PlatformType)}={query.PlatformType}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberCoupon_Extend.UserId)}={query.UserId}");
+                }
+                if (query.CouponId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberCoupon_Extend.CouponId)}={query.CouponId}");
+                }
+                if (!string.IsNullOrEmpty(query.CouponIds))
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberCoupon_Extend.CouponId)} in ({query.CouponIds})");
+                }
+                if (!string.IsNullOrEmpty(query.Ids))
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberCoupon_Extend.Id)} in ({query.Ids})");
+                }
+            }
+            string sql = @$" select * FROM {TableName} AS a  where 1=1 {builder.ToString()} ";
+            return Get<RB_Education_MemberCoupon_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_MemberUseCouponRepository.cs

+using Mall.Model.Entity.Education;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Education
+{
+  public  class RB_Education_MemberUseCouponRepository:BaseRepository<RB_Education_MemberUseCoupon>
+    {
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Education_MemberUseCoupon); } }
+
+
+
+        /// <summary>
+        /// 会员优惠券
+        /// </summary>
+        /// <returns></returns>
+        public List<RB_Education_MemberUseCoupon> GetList(RB_Education_MemberUseCoupon query)
+        {
+            StringBuilder builder = new StringBuilder();
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberUseCoupon.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberUseCoupon.MallBaseId)}={query.MallBaseId}");
+                }
+                
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberUseCoupon.UserId)}={query.UserId}");
+                }
+                if (query.MemberCouponId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Education_MemberUseCoupon.MemberCouponId)}={query.MemberCouponId}");
+                }
+              
+            }
+            string sql = @$" select * FROM {TableName} AS a  where 1=1 {builder.ToString()} ";
+            return Get<RB_Education_MemberUseCoupon>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_TeacherRepository.cs

+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_TeacherRepository : BaseRepository<RB_Education_Teacher>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Education_Teacher); } }
+        /// <summary>
+        /// 网课-老师列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_Teacher_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Education_Teacher_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Education_Teacher_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.ID)}={query.ID}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.Name)} like '%{query.Name}%'");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Telephone))
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.Telephone)} like '%{query.Telephone}%'");
+                }
+                if (query.TeacherStatus > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.TeacherStatus)}={query.TeacherStatus}");
+                }
+            }
+            return GetPage<RB_Education_Teacher_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 网课-老师列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Education_Teacher_Extend> GetTeacherList(RB_Education_Teacher_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Education_Teacher_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.ID)}={query.ID}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.Name)} like '%{query.Name}%'");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Telephone))
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.Telephone)} like '%{query.Telephone}%'");
+                }
+                if (query.TeacherStatus > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Education_Teacher_Extend.TeacherStatus)}={query.TeacherStatus}");
+                }
+            }
+            return Get<RB_Education_Teacher_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1105,6 +1105,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.CoverImage,
                 x.SpecificationList,
                 x.IsComment,
+                x.OrderId,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);

Mall.WebApi/Mall.WebApi.csproj

@@ -33,6 +33,7 @@
     <ProjectReference Include="..\Mall.DataHelper\Mall.DataHelper.csproj" />
     <ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
     <ProjectReference Include="..\Mall.Module.BaseSetUp\Mall.Module.BaseSetUp.csproj" />
+    <ProjectReference Include="..\Mall.Module.Education\Mall.Module.Education.csproj" />
     <ProjectReference Include="..\Mall.Module.MarketingCenter\Mall.Module.MarketingCenter.csproj" />
     <ProjectReference Include="..\Mall.Module.Product\Mall.Module.Product.csproj" />
     <ProjectReference Include="..\Mall.Module.Property\Mall.Module.Property.csproj" />

Mall.sln

@@ -50,6 +50,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mall.Education", "Mall.Education\Mall.Education.csproj", "{CE026CAA-B6E6-47F5-9998-181A07679DA0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mall.EducationClient", "Mall.EducationClient\Mall.EducationClient.csproj", "{B665F9E2-C1D6-418C-9A1A-D777E3157799}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mall.Module.Education", "Mall.Module.Education\Mall.Module.Education.csproj", "{B076F66B-B75E-43DE-B305-764BF3638A91}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -133,6 +134,10 @@ Global
 		{B665F9E2-C1D6-418C-9A1A-D777E3157799}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B665F9E2-C1D6-418C-9A1A-D777E3157799}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B665F9E2-C1D6-418C-9A1A-D777E3157799}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B076F66B-B75E-43DE-B305-764BF3638A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B076F66B-B75E-43DE-B305-764BF3638A91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B076F66B-B75E-43DE-B305-764BF3638A91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B076F66B-B75E-43DE-B305-764BF3638A91}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -152,6 +157,7 @@ Global
 		{C7DE85C9-8620-47A9-AE2F-DD1408DD886B} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
 		{CE026CAA-B6E6-47F5-9998-181A07679DA0} = {646382A6-0092-441C-B202-ED8C3DE015B5}
 		{B665F9E2-C1D6-418C-9A1A-D777E3157799} = {646382A6-0092-441C-B202-ED8C3DE015B5}
+		{B076F66B-B75E-43DE-B305-764BF3638A91} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {450F460D-A6AE-4FE3-948A-34E5FB8DBD7C}