提交代码

Mall.Common/Enum/Reserve/GenderEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.Reserve
+{
+    public enum GenderEnum
+    {
+        /// <summary>
+        /// 保密
+        /// </summary>
+        [EnumField("保密")]
+        Secrecy = 0,
+        /// <summary>
+        /// 男
+        /// </summary>
+        [EnumField("男")]
+        Man = 1,
+        /// <summary>
+        /// 女
+        /// </summary>
+        [EnumField("女")]
+        Woman = 2
+    }
+}

Mall.Common/Enum/Reserve/ServiceTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.Reserve
+{
+    /// <summary>
+    /// 1-指定商品类型，2-指定商品，3-全场通用
+    /// </summary>
+    public enum ServiceTypeEnum
+    {
+        /// <summary>
+        /// 指定商品类型
+        /// </summary>
+        [EnumField("指定商品类型")]
+        Category = 1,
+        /// <summary>
+        /// 指定商品
+        /// </summary>
+        [EnumField("指定商品")]
+        Product = 2,
+
+        /// <summary>
+        /// 全场通用
+        /// </summary>
+        [EnumField("全场通用")]
+        All = 3,
+
+    }
+}

Mall.Model/Entity/Reserve/RB_Reserve_Coupon.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    ///  预约-预约卡实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_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; }
+
+        /// <summary>
+        /// 最高抵扣金额
+        /// </summary>
+        public decimal MaxDiscountsPrice { get; set; }
+    }
+}

Mall.Model/Entity/Reserve/RB_Reserve_CouponProduct.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 预约-预约卡指定商品/分类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_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 ServiceType { get; set; }
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+    }
+}

Mall.Model/Entity/Reserve/RB_Reserve_CouponSelfMotion.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 自动发放预约-预约卡
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_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/Reserve/RB_Reserve_CouponSelfMotionMember.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 自动发放预约-预约卡-指定会员
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_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/Reserve/RB_Reserve_MemberCoupon.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 预约-预约卡实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_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/Reserve/RB_Reserve_MemberUseCoupon.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 会员使用预约-预约卡劵实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_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; }
+
+        /// <summary>
+        /// 使用数
+        /// </summary>
+        public int UseHeXiao { get; set; }
+    }
+}

Mall.Model/Entity/Reserve/RB_Reserve_ServicePersonal.cs

+using Mall.Common.Enum.GuideCar;
+using Mall.Common.Enum.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 服务人员实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_ServicePersonal
+    {
+        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 ServiceLogo { get; set; }
+
+        public string LableName { get; set; }
+
+        /// <summary>
+        /// 职务
+        /// </summary>
+        public string Major { get; set; }
+        /// <summary>
+        /// 状态1上架  2下架
+        /// </summary>
+        public int ServiceStatus { get; set; }
+
+        /// <summary>
+        /// 关联门店
+        /// </summary>
+        public int StoreId { get; set; }
+
+
+        /// <summary>
+        /// 性别0-保密，1-男，2-女
+        /// </summary>
+        public GenderEnum Gender { get; set; }
+
+
+
+        public ServiceTypeEnum ServiceType { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Telephone { get; set; }
+
+
+
+        /// <summary>
+        /// 好评率
+        /// </summary>
+        public decimal Score { get; set; }
+
+
+
+        /// <summary>
+        /// 虚拟预约数量
+        /// </summary>        
+        public int FictitiousReserveNum
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 从业年限
+        /// </summary>
+        public decimal WorkYears { get; set; }
+
+    }
+}

Mall.Model/Entity/Reserve/RB_Reserve_ServicePersonalProduct.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum.Reserve;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 服务人员指定商品/分类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_ServicePersonalProduct
+    {  /// <summary>
+       /// 服务id
+       /// </summary>
+        public int ServiceId { 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 ServiceTypeEnum ServiceType { get; set; }
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+    }
+}

Mall.Model/Entity/Reserve/RB_Reserve_ServiceTargetDate.cs

+using VT.FW.DB;
+using Mall.Common.Enum.Goods;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Reserve
+{
+    /// <summary>
+    /// 服务人员排版
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_ServiceTargetDate
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 服务人员id
+        /// </summary>        
+        public int ServiceId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 可预定日期
+        /// </summary>
+        public DateTime? Date { get; set; }
+        /// <summary>
+        /// 是否可以预定  1是  2否
+        /// </summary>
+        public int IsReserve { get; set; }
+    }
+}

Mall.Model/Extend/Reserve/RB_Reserve_CSelfMotionMember_Extend.cs

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

Mall.Model/Extend/Reserve/RB_Reserve_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;
+using Mall.Model.Entity.Reserve;
+
+namespace Mall.Model.Extend.Reserve
+{
+    /// <summary>
+    /// 自动发放优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_CSelfMotion_Extend : RB_Reserve_CouponSelfMotion
+    {
+
+        public List<RB_Reserve_CSelfMotionMember_Extend> UserList { get; set; }
+
+        /// <summary>
+        /// 优惠券名字
+        /// </summary>
+        public string DiscountCouponName { get; set; }
+    }
+}

Mall.Model/Extend/Reserve/RB_Reserve_CouponProduct_Extend.cs

+using Mall.Model.Entity.Education;
+using Mall.Model.Entity.Reserve;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Reserve
+{
+    /// <summary>
+    /// 教育-课程卡关联的商品/分类扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_CouponProduct_Extend : RB_Reserve_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/Reserve/RB_Reserve_Coupon_Extend.cs

+using Mall.Model.Entity.Education;
+using Mall.Model.Entity.Reserve;
+using System;
+using System.Collections.Generic;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Reserve
+{
+    /// <summary>
+    /// 课程卡扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_Coupon_Extend : RB_Reserve_Coupon
+    {
+        /// <summary>
+        /// 商品/分类id
+        /// </summary>
+        public List<RB_Reserve_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; }
+
+        public DateTime? RegisterDate { get; set; }
+    }
+}

Mall.Model/Extend/Reserve/RB_Reserve_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.Reserve;
+
+namespace Mall.Model.Extend.Reserve
+{
+    /// <summary>
+    /// 会员优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_MemberCoupon_Extend : RB_Reserve_MemberCoupon
+    {
+        public int PlatformType { get; set; }
+
+
+        public string CouponIco { get; set; }
+
+        /// <summary>
+        /// 下单时间
+        /// </summary>
+        public DateTime? OrderCreateDate { get; set; }
+
+        /// <summary>
+        /// 使用时间列表
+        /// </summary>
+        public List<RB_Reserve_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/Reserve/RB_Reserve_ServicePersonalProduct_Extend.cs

+using Mall.Model.Entity.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.Reserve
+{
+  public  class RB_Reserve_ServicePersonalProduct_Extend: RB_Reserve_ServicePersonalProduct
+    {
+        /// <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/Reserve/RB_Reserve_ServicePersonal_Extend.cs

+using Mall.Model.Entity.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Reserve
+{
+
+    /// <summary>
+    ///  服务人员扩展表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_ServicePersonal_Extend : RB_Reserve_ServicePersonal
+    {
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public List<string> LableNameList { get; set; }
+
+        /// <summary>
+        /// 预约数
+        /// </summary>
+        public int OrderNum { get; set; }
+
+        /// <summary>
+        /// 订单人数
+        /// </summary>
+        public int OrderGuestNum { get; set; }
+
+
+        /// <summary>
+        /// 商品分类id
+        /// </summary>
+        public int[] GoodsClassId { get; set; }
+
+        /// <summary>
+        /// 店铺名称
+        /// </summary>
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 可预约时间
+        /// </summary>
+
+        public List<RB_Reserve_ServiceTargetDate> ServiceTargetDateList { get; set; }
+        /// <summary>
+        /// 商品/分类id
+        /// </summary>
+        public List<RB_Reserve_ServicePersonalProduct_Extend> ProductList { get; set; }
+    }
+}

Mall.Model/Extend/Reserve/RB_Reserve_ServiceTargetDate_Extend.cs

+using Mall.Model.Entity.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Reserve
+{
+
+    /// <summary>
+    /// 服务人员排班
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Reserve_ServiceTargetDate_Extend : RB_Reserve_ServiceTargetDate
+    {
+        /// <summary>
+        /// 服务人员ids
+        /// </summary>
+        public string ServiceIds { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public string DateTime { get; set; }
+        /// <summary>
+        /// 月份
+        /// </summary>
+        public string Month { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+    }
+}

Mall.Module.Reserve/Mall.Module.Reserve.csproj

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

Mall.Repository/Reserve/RB_Reserve_CouponProductRepository.cs

+using Mall.Model.Entity.Reserve;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.Reserve;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Reserve
+{
+    public class RB_Reserve_CouponProductRepository : BaseRepository<RB_Reserve_CouponProduct>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Reserve_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_Reserve_CouponProduct> GetCouponProductList(RB_Reserve_CouponProduct query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Reserve_CouponProduct.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_CouponProduct.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_CouponProduct.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_CouponProduct.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.CouponId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_CouponProduct.CouponId)}={query.CouponId}");
+                }
+            }
+            return Get<RB_Reserve_CouponProduct>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 优惠券对应的商品/分类列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Reserve_CouponProduct_Extend> GetListByDiscountCouponIds(RB_Reserve_Coupon query, string DiscountCouponIds,bool IsSelectDel =false)
+        {
+            StringBuilder builder = new StringBuilder();
+
+            if (query != null)
+            {
+                
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_CouponProduct.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_CouponProduct.MallBaseId)}={query.MallBaseId}");
+                }
+            }
+            if (!string.IsNullOrWhiteSpace(DiscountCouponIds))
+            {
+                builder.Append($" AND a.{nameof(RB_Reserve_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_Reserve_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_Reserve_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_Reserve_CouponProduct.Status)}=0 {builder.ToString()} ";
+            }
+            return Get<RB_Reserve_CouponProduct_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Reserve/RB_Reserve_CouponSelfMotionMemberRepository.cs

+using Mall.Model.Entity.Reserve;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.Reserve;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Reserve
+{
+    public class RB_Reserve_CouponSelfMotionMemberRepository : BaseRepository<RB_Reserve_CouponSelfMotionMember>
+    {
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Reserve_CouponSelfMotionMember); } }
+
+        // <summary>
+        /// 表名称
+        /// </summary>
+        public string UserTableName { get { return nameof(RB_Member_User); } }
+
+        /// <summary>
+        /// 获取发放优惠券的人员信息
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Reserve_CSelfMotionMember_Extend> GetListRepository(RB_Reserve_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_Reserve_CSelfMotionMember_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_CSelfMotionMember_Extend.TenantId)}={query.TenantId}");
+                }
+
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_CSelfMotionMember_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.SelfMotionId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_CSelfMotionMember_Extend.SelfMotionId)}={query.SelfMotionId}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_CSelfMotionMember_Extend.UserId)}={query.UserId}");
+                }
+
+                //if (!string.IsNullOrWhiteSpace(query.PriceIds))
+                //{
+                //    builder.Append($" AND a.{nameof(RB_Reserve_CSelfMotionMember_Extend.RulesPriceId)} in ({query.PriceIds})");
+                //}
+            }
+            return Get<RB_Reserve_CSelfMotionMember_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Reserve/RB_Reserve_CouponSelfMotionRepository.cs

+using Mall.Model.Entity.Reserve;
+using Mall.Model.Extend.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Reserve
+{
+  public  class RB_Reserve_CouponSelfMotionRepository:BaseRepository<RB_Reserve_CouponSelfMotion>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Reserve_CouponSelfMotion); } }
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string discountCouponTableName { get { return nameof(RB_Reserve_Coupon); } }
+        /// <summary>
+        /// 自动发放优惠券规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Reserve_CSelfMotion_Extend> GetSelfMotionPageLis(int pageIndex, int pageSize, out long rowCount, RB_Reserve_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_Reserve_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_Reserve_CSelfMotion_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_CSelfMotion_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.DiscountCouponId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_CSelfMotion_Extend.DiscountCouponId)}={query.DiscountCouponId}");
+                }
+            }
+            return GetPage<RB_Reserve_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_Reserve_CSelfMotion_Extend> GettRepositoryList(RB_Reserve_CSelfMotion_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Reserve_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_Reserve_CSelfMotion_Extend.TenantId)}={query.TenantId}");
+                    }
+                    if (query.ID > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Reserve_CSelfMotion_Extend.ID)}={query.ID}");
+                    }
+                    if (query.TenantId > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Reserve_CSelfMotion_Extend.MallBaseId)}={query.MallBaseId}");
+                    }
+                    if (query.DiscountCouponId > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Reserve_CSelfMotion_Extend.DiscountCouponId)}={query.DiscountCouponId}");
+                    }
+                }
+            }
+            return Get<RB_Reserve_CSelfMotion_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Reserve/RB_Reserve_MemberCouponRepository.cs

+using Mall.Model.Entity.Reserve;
+using Mall.Model.Extend.Reserve;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Reserve
+{
+    public  class RB_Reserve_MemberCouponRepository : BaseRepository<RB_Reserve_MemberCoupon>
+    {
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Reserve_MemberCoupon); } }
+
+
+
+        /// <summary>
+        /// 会员优惠券
+        /// </summary>
+        /// <returns></returns>
+        public List<RB_Reserve_MemberCoupon_Extend> GetList(RB_Reserve_MemberCoupon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($"   and a.`Status`=0 ");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.PlatformType > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.PlatformType)}={query.PlatformType}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.UserId)}={query.UserId}");
+                }
+                if (query.CouponId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.CouponId)}={query.CouponId}");
+                }
+                if (!string.IsNullOrEmpty(query.CouponIds))
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.CouponId)} in ({query.CouponIds})");
+                }
+                if (!string.IsNullOrEmpty(query.Ids))
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.Id)} in ({query.Ids})");
+                }
+                //if (query.UseState >= 0)
+                //{
+                //    builder.Append($" AND a.{nameof(RB_Member_DiscountCoupon_Extend.UseState)}={query.UseState}");
+                //}
+            }
+            string sql = @$" select * FROM {TableName} AS a  where 1=1 {builder.ToString()} ";
+            return Get<RB_Reserve_MemberCoupon_Extend>(sql).ToList();
+        }
+
+
+
+        /// <summary>
+        /// 自动发放优惠券信息
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Reserve_MemberCoupon_Extend> GetAutoMemberCouponPageList(RB_Reserve_MemberCoupon_Extend query)
+        {
+            string where = "   where a.`Status`=0 ";
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    where += $" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.TenantId)}={query.TenantId}";
+                }
+                if (query.MallBaseId > 0)
+                {
+                    where += $" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.MallBaseId)}={query.MallBaseId}";
+                }
+                if (query.UserId > 0)
+                {
+                    where += $" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.UserId)}={query.UserId}";
+                }
+                if (query.GetType > 0)
+                {
+                    where += $" AND a.{nameof(RB_Reserve_MemberCoupon_Extend.GetType)}={query.GetType}";
+                }
+            }
+            string sql = @$" SELECT a.* from rb_Reserve_membercoupon as a  {where} ";
+            return Get<RB_Reserve_MemberCoupon_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Reserve/RB_Reserve_MemberUseCouponRepository.cs

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

Mall.Repository/Reserve/RB_Reserve_ServicePersonalProductRepository.cs

+using Mall.Model.Entity.Reserve;
+using Mall.Model.Extend.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Reserve
+{
+    public class RB_Reserve_ServicePersonalProductRepository:BaseRepository<RB_Reserve_ServicePersonalProduct>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Reserve_ServicePersonalProduct); } }
+
+        /// <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_Reserve_ServicePersonalProduct> GetServicePersonalProductList(RB_Reserve_ServicePersonalProduct query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Reserve_ServicePersonalProduct.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonalProduct.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonalProduct.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonalProduct.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ServiceId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonalProduct.ServiceId)}={query.ServiceId}");
+                }
+            }
+            return Get<RB_Reserve_ServicePersonalProduct>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 服务人员对应的商品/分类列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Reserve_ServicePersonalProduct_Extend> GetListByServicePersonalProductIds(RB_Reserve_ServicePersonal_Extend query, string ServiceIds, bool IsSelectDel = false)
+        {
+            StringBuilder builder = new StringBuilder();
+
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonalProduct.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonalProduct.MallBaseId)}={query.MallBaseId}");
+                }
+            }
+            if (!string.IsNullOrWhiteSpace(ServiceIds))
+            {
+                builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonalProduct.ServiceId)} in ({ServiceIds})");
+            }
+            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_Reserve_ServicePersonalProduct.Status)}=0 {builder.ToString()}  ";
+            }
+            if (query.ServiceType == Common.Enum.Reserve.ServiceTypeEnum.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_Reserve_ServicePersonalProduct.Status)}=0 {builder.ToString()} ";
+            }
+            else if (query.ServiceType == Common.Enum.Reserve.ServiceTypeEnum.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_Reserve_ServicePersonalProduct.Status)}=0 {builder.ToString()} ";
+            }
+            return Get<RB_Reserve_ServicePersonalProduct_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Reserve/RB_Reserve_ServicePersonalRepository.cs

+using Mall.Model.Entity.Reserve;
+using Mall.Model.Extend.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Reserve
+{
+    public class RB_Reserve_ServicePersonalRepository:BaseRepository<RB_Reserve_ServicePersonal>
+    {
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Reserve_ServicePersonal); } }
+
+
+
+        /// <summary>
+        ///服务人员信息列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Reserve_ServicePersonal_Extend> GetServicePersonalPageList(int pageIndex, int pageSize, out long rowCount, RB_Reserve_ServicePersonal_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT a.*,b.`Name` as  StoreName FROM {TableName} as A  LEFT JOIN rb_stores as b on a.StoreId=b.Id WHERE  a.{nameof(RB_Reserve_ServicePersonal_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            builder.Append($"  order by  a.{nameof(RB_Reserve_ServicePersonal_Extend.ID)} desc");
+            return GetPage<RB_Reserve_ServicePersonal_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 服务人员信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Reserve_ServicePersonal_Extend> GetServicePersonalList(RB_Reserve_ServicePersonal_Extend query, bool IsSelectDel = false)
+        {
+            StringBuilder builder = new StringBuilder();
+            if (IsSelectDel)
+            {
+                builder.Append($" SELECT * FROM {TableName} WHERE 1=1 ");
+            }
+            else
+            {
+                builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Reserve_ServicePersonal_Extend.Status)}=0 ");
+            }
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
+                }
+              
+            }
+            return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Reserve/RB_Reserve_ServiceTargetDateRepository.cs

+using Mall.Model.Entity.Reserve;
+using Mall.Model.Extend.Reserve;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Reserve
+{
+    public class RB_Reserve_ServiceTargetDateRepository : BaseRepository<RB_Reserve_ServiceTargetDate>
+    {
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Reserve_ServiceTargetDate_Extend> GetList(RB_Reserve_ServiceTargetDate_Extend dmodel)
+        {
+            string where = $" 1=1 and Date >= '{DateTime.Now.ToString("yyyy-MM-dd")}'";
+
+            if (dmodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_Reserve_ServiceTargetDate.Id)}={dmodel.Id}";
+            }
+            if (dmodel.ServiceId > 0)
+            {
+                where += $@" and {nameof(RB_Reserve_ServiceTargetDate.ServiceId)}={dmodel.ServiceId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.ServiceIds))
+            {
+                where += $@" and {nameof(RB_Reserve_ServiceTargetDate.ServiceId)} in({dmodel.ServiceIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.DateTime))
+            {
+                where += $@" and {nameof(RB_Reserve_ServiceTargetDate.Date)} ='{dmodel.DateTime}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += $@" and {nameof(RB_Reserve_ServiceTargetDate.Date)} >='{dmodel.StartTime}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += $@" and {nameof(RB_Reserve_ServiceTargetDate.Date)} <='{dmodel.EndTime} 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Month))
+            {
+                where += $@" and DATE_FORMAT(Date,'%Y-%m') ='{dmodel.Month}'";
+            }
+            if (dmodel.IsReserve > 0)
+            {
+                where += $@" and {nameof(RB_Reserve_ServiceTargetDate.IsReserve)}={dmodel.IsReserve}";
+            }
+
+            string sql = $@"select * from RB_Reserve_ServiceTargetDate where {where} order by Date asc";
+            return Get<RB_Reserve_ServiceTargetDate_Extend>(sql).ToList();
+        }
+    }
+}