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

Mall.Common/Enum/MarketingCenter/CouponTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.MarketingCenter
+{
+    public enum CouponTypeEnum
+    {
+        
+        /// <summary>
+        /// 满减券
+        /// </summary>
+        [EnumField("满减券")]
+        FullReduction = 1,
+        /// <summary>
+        /// 打折券
+        /// </summary>
+        [EnumField("打折券")]
+        Discount = 2,
+    }
+}

Mall.Common/Enum/MarketingCenter/IndateTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.MarketingCenter
+{
+    public enum IndateTypeEnum
+    {
+        /// <summary>
+        /// 时间段
+        /// </summary>
+        [EnumField("时间段")]
+        TimeHorizon = 2,
+        /// <summary>
+        /// 领取后N天内有效
+        /// </summary>
+        [EnumField("领取后N天内有效")]
+        DayHorizon = 1,
+    }
+}

Mall.Common/Enum/MarketingCenter/PickupTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.MarketingCenter
+{
+    /// <summary>
+    /// 1-会员专享2-领劵中心
+    /// </summary>
+    public enum PickupTypeEnum
+    {
+        /// <summary>
+        /// 会员专享
+        /// </summary>
+        [EnumField("会员专享")]
+        OnlyMember = 1,
+        /// <summary>
+        /// 领劵中心
+        /// </summary>
+        [EnumField("领劵中心")]
+        CouponCenter = 2,
+    }
+}

Mall.Common/Enum/MarketingCenter/UseTypeEnum.cs

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

Mall.Model/Entity/MarketingCenter/RB_Coupon.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 卡券实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_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-领取后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>
+        /// 描述
+        /// </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/MarketingCenter/RB_Coupon_SelfMotion.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 自动发放优惠券
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Coupon_SelfMotion
+    {
+        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 int 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/MarketingCenter/RB_Coupon_SelfMotionMember.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 自动发放优惠券-指定会员
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Coupon_SelfMotionMember
+    {
+        /// <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/MarketingCenter/RB_DiscountCoupon.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 优惠券实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+  public  class RB_DiscountCoupon
+    {
+
+        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; }
+
+        /// <summary>
+        /// 有效期类型，1-领取后N天内有效，2-时间段
+        /// </summary>
+        public IndateTypeEnum IndateType { get; set; }
+
+        /// <summary>
+        /// 有效天数
+        /// </summary>
+        public int IndateDay { get; set; }
+
+        /// <summary>
+        /// 可发放数量,-1 无限制
+        /// </summary>
+        public int TotalNum { 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>
+        /// 1-满减券，2-打折券
+        /// </summary>
+        public CouponTypeEnum CouponType { get; set; }
+
+
+        /// <summary>
+        ///排序
+        /// </summary>
+        public int Sort { get; set; }
+
+
+        /// <summary>
+        /// 1-指定商品类型，2-指定商品，3-全场通用，4-当面付
+        /// </summary>
+        public UseTypeEnum UseType { get; set; }
+
+
+        /// <summary>
+        /// 最低消费金额（元）
+        /// </summary>
+        public decimal MinConsumePrice { get; set; }
+
+
+        /// <summary>
+        /// 优惠金额/折扣
+        /// </summary>
+        public decimal DiscountsPrice { get; set; }
+
+
+        /// <summary>
+        ///最多优惠（元）
+        /// </summary>
+        public decimal MaxDiscountsPrice { get; set; }
+
+
+        /// <summary>
+        /// 领取方式设置1-会员专享2-领劵中心
+        /// </summary>
+        public PickupTypeEnum PickupType { get; set; }
+    }
+}

Mall.Model/Entity/MarketingCenter/RB_DiscountCoupon_Product.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 优惠券指定商品/分类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_DiscountCoupon_Product
+    {  /// <summary>
+       /// 价格
+       /// </summary>
+        public int DiscountCouponId { 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/Product/RB_Goods.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 轮播图  json 格式  第一张为封面图
+        /// </summary>        
+        public string CarouselImage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 视频地址
+        /// </summary>        
+        public string VideoAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 自定义分享标题
+        /// </summary>        
+        public string CustomShareTitles
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 自定义分享图片
+        /// </summary>        
+        public int? CustomShareImage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品状态   1销售中  2下架中
+        /// </summary>        
+        public int? GoodsStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 库存数量
+        /// </summary>        
+        public int? InventoryNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 默认规格名
+        /// </summary>        
+        public string DefaultSpecificationName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否自定义规格  1是  2否
+        /// </summary>        
+        public int? IsCustomSpecification
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 售价
+        /// </summary>        
+        public decimal? SellingPrice
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 原价
+        /// </summary>        
+        public decimal? OriginalPrice
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单位
+        /// </summary>        
+        public string Unit
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 成本价格
+        /// </summary>        
+        public decimal? CostPrice
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品面议  1是  2否
+        /// </summary>        
+        public int? IsGoodsNegotiable
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 已售出数量
+        /// </summary>        
+        public int? SalesNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品货号
+        /// </summary>        
+        public string GoodsNumbers
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品重量   克
+        /// </summary>        
+        public int? GoodsWeight
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否默认服务  1是  2否
+        /// </summary>        
+        public int? IsDefaultService
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品服务  json格式
+        /// </summary>        
+        public string GoodsService
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 运费设置
+        /// </summary>        
+        public int? FreightId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 自定义表单
+        /// </summary>        
+        public int? FormsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 限购商品数量
+        /// </summary>        
+        public int? LimitBuyGoodsNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 限购订单数量
+        /// </summary>        
+        public int? LimitBuyOrderNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单品满件包邮
+        /// </summary>        
+        public int? FullNumPinkage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单品满额包邮
+        /// </summary>        
+        public decimal? FullMoneyPinkage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否区域购买  1是  2否
+        /// </summary>        
+        public int? IsAreaBuy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 积分赠送
+        /// </summary>        
+        public int? IntegralPresent
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 赠送类型  1固定值  2百分比
+        /// </summary>        
+        public int? IntegralPresentType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 积分抵扣 
+        /// </summary>        
+        public decimal? PointsDeduction
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 抵扣类型  1固定值  2百分比
+        /// </summary>        
+        public int? PointsDeductionType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否允许多件累计抵扣  1是  2否
+        /// </summary>        
+        public int? IsMultipleDeduction
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品详情
+        /// </summary>        
+        public string GoodsDetails
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否开启单独分销   1是  2否
+        /// </summary>        
+        public int? SeparateDistribution
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单独分销类型  1普通设置  2详细设置
+        /// </summary>        
+        public int? SeparateDistributionType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分销佣金类型   1固定金额   2百分比
+        /// </summary>        
+        public int? SeparateDistributionMoneyType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否享受会员功能   1是  2否
+        /// </summary>        
+        public int? EnjoyMember
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否单独设置会员价  1是  2否
+        /// </summary>        
+        public int? SeparateSetMember
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否加入快速购买  1是  2否
+        /// </summary>
+        public int? IsQuickBuy { get; set; }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_Area.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品关联区域表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Area
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 区域id
+        /// </summary>        
+        public int? AreaId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 区域类型  1国家  2省  3市  4区
+        /// </summary>        
+        public int? AreaType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_Category.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品关联分类表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Category
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类id
+        /// </summary>        
+        public int? CategoryId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_Specification.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品关联规格表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Specification
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否启用规格图片  1是  2否
+        /// </summary>        
+        public int? EnabledImage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// Status
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_SpecificationPrice.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品关联规格价格表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_SpecificationPrice
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格值 排序组
+        /// </summary>        
+        public string SpecificationSort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 价格
+        /// </summary>        
+        public decimal? SellingPrice
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 库存
+        /// </summary>        
+        public int? InventoryNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品重量   克
+        /// </summary>        
+        public int? GoodsWeight
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品货号
+        /// </summary>        
+        public string GoodsNumbers
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// Status
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_SpecificationValue.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品关联规格值表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_SpecificationValue
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// GoodsId
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格id
+        /// </summary>        
+        public int? SpecificationId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格值名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格图片
+        /// </summary>        
+        public int? Image
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序  不能重复  用于价格绑定Key
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// Status
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Product_QuickBuy.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品快速购买表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_QuickBuy
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类id
+        /// </summary>        
+        public int? CategoryId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Product_Recommend.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品推荐设置表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_Recommend
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品详情页面推荐状态  1开启  2禁止
+        /// </summary>        
+        public int? DetailRecommendStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 推荐数量
+        /// </summary>        
+        public int? DetailRecommendNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单完成后推荐状态  1开启  2禁止
+        /// </summary>        
+        public int? OrderCompleteStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否自定义  1是  2否
+        /// </summary>        
+        public int? IsOrderRecommend
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 自定义商品ids  逗号分隔
+        /// </summary>        
+        public string OrderProductIds
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评论后推荐商品状态  1开启  2禁止
+        /// </summary>        
+        public int? CommentRecommentStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评论后自定义推荐商品  1是  2否
+        /// </summary>        
+        public int? IsCommentRecommend
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评论后推荐商品ids 逗号分隔
+        /// </summary>        
+        public string CommentProductIds
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Product_Service.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品服务表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_Service
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 服务名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 备注
+        /// </summary>        
+        public string Remark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否默认  1是  2否
+        /// </summary>        
+        public int? IsDefault
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Product_Specification.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品规格表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_Specification
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格内容  json格式
+        /// </summary>        
+        public string Content
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/User/RB_Member_DiscountCoupon.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 会员优惠券实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Member_DiscountCoupon
+
+    {
+        /// <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>
+        /// 平台类型
+        /// </summary>
+        public PlatformTypeEnum? PlatformType { get; set; }
+
+        /// <summary>
+        /// 使用状态 0-未使用，1:已使用，2:已作废
+        /// </summary>
+        public int UseState { get; set; }
+
+        /// <summary>
+        /// 优惠券id
+        /// </summary>
+        public int CouponId { get; set; }
+
+        /// <summary>
+        /// 使用时间
+        /// </summary>
+        public DateTime? UseDate { get; set; }
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime? StartDate { get; set; }
+
+
+
+        public DateTime? EndDate { get; set; }
+
+
+    }
+}

Mall.Model/Entity/User/RB_MiniProgram_FenXiaoPoster.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 分销海报实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_FenXiaoPoster
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        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 PosterBgImg { get; set; }
+
+        /// <summary>
+        /// 是否显示头像(0-显示，1-不显示)
+        /// </summary>
+        public int IsShowHead { get; set; }
+
+        /// <summary>
+        /// 头像大小
+        /// </summary>
+        public int HeadSize { get; set; }
+
+        /// <summary>
+        /// 头像上间距
+        /// </summary>
+        public int HeadPaddingTop { get; set; }
+
+        /// <summary>
+        /// 头像左间距
+        /// </summary>
+        public int HeadPaddingLeft { get; set; }
+
+        /// <summary>
+        /// 是否显示昵称(0-显示,1-不显示)
+        /// </summary>
+        public int IsShowNick { get; set; }
+
+        /// <summary>
+        /// 昵称大小
+        /// </summary>
+        public int NickSize { get; set; }
+
+        /// <summary>
+        /// 昵称上间距
+        /// </summary>
+        public int NickPaddingTop { get; set; }
+
+        /// <summary>
+        /// 昵称左间距
+        /// </summary>
+        public int NickPaddingLeft { get; set; }
+
+
+        /// <summary>
+        /// 是否显示二维码(0-显示,1-不显示)
+        /// </summary>
+        public int IsShowQrCode { get; set; }
+
+        /// <summary>
+        /// 二维码大小
+        /// </summary>
+        public int QrCodeSize { get; set; }
+
+        /// <summary>
+        /// 二维码上间距
+        /// </summary>
+        public int QrCodePaddingTop { get; set; }
+
+        /// <summary>
+        /// 二维码上间距
+        /// </summary>
+        public int QrCodePaddingLeft { get; set; }
+
+    }
+}

Mall.Model/Entity/User/RB_MiniProgram_GoodPoster.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 商品海报实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_GoodPoster
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 是否现在昵称(0-显示,1-不显示)
+        /// </summary>
+        public int IsShowNick { get; set; }
+
+        /// <summary>
+        /// 是否显示商品描述(0-显示，1-不显示)
+        /// </summary>
+        public int IsShowGoodsDes { get; set; }
+
+        /// <summary>
+        /// 是否显示商品信息(0-显示，1-不显示)
+        /// </summary>
+        public int IsShowGoodsInfo { get; set; }
+
+        /// <summary>
+        /// 商品图片数量
+        /// </summary>
+        public int GoodsImgCount { get; set; }
+    }
+}

Mall.Model/Entity/User/RB_MiniProgram_UserCenterConfig.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 小程序用户中心配置实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_UserCenterConfig
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        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 DefaultBgImg { get; set; }
+
+        /// <summary>
+        /// 普通用户背景
+        /// </summary>
+        public string MemberBgImg { get; set; }
+
+        /// <summary>
+        /// 会员中心背景
+        /// </summary>
+        public string VipBgImg { get; set; }
+
+        /// <summary>
+        /// 头像样式类型(1-头像靠左，2-头像居中，3-头像内嵌)
+        /// </summary>
+        public int HeadStyle { get; set; }
+
+        /// <summary>
+        /// 头像样式字符串
+        /// </summary>
+        public string HeadStyleStr { get; set; }
+
+        /// <summary>
+        /// 是否显示收藏夹(0-显示，1-不显示)
+        /// </summary>
+        public int IsShowFavorite { get; set; }
+
+        /// <summary>
+        /// 我的收藏图片
+        /// </summary>
+        public string MyFavoriteImg { get; set; }
+
+        /// <summary>
+        /// 我的足迹图片
+        /// </summary>
+        public string MyFootPrintImg { get; set; }
+
+        /// <summary>
+        /// 是否显示订单栏(0-显示，1-不显示)
+        /// </summary>
+        public int IsShowOrderNav { get; set; }
+
+        /// <summary>
+        /// 待付款图片
+        /// </summary>
+        public string NoPayImg { get; set; }
+
+        /// <summary>
+        /// 待发货图片
+        /// </summary>
+        public string NoDeliveryImg { get; set; }
+
+        /// <summary>
+        /// 待收货图片
+        /// </summary>
+        public string NoReciveImg { get; set; }
+
+        /// <summary>
+        /// 待评价图片
+        /// </summary>
+        public string NoEvaluation { get; set; }
+
+        /// <summary>
+        /// 售后图片
+        /// </summary>
+        public string AfterSales { get; set; }
+
+        /// <summary>
+        /// 是否显示账户栏(0-显示，1-不显示)
+        /// </summary>
+        public int IsShowAccountNav { get; set; }
+
+        /// <summary>
+        /// 积分自定义名称
+        /// </summary>
+        public string IntegralName { get; set; }
+
+        /// <summary>
+        /// 积分图片
+        /// </summary>
+        public string IntegralImg { get; set; }
+
+        /// <summary>
+        /// 余额自定义名称
+        /// </summary>
+        public string BalanceName { get; set; }
+
+        /// <summary>
+        /// 余额自定义图片
+        /// </summary>
+        public string BalanceImg { get; set; }
+
+        /// <summary>
+        /// 优惠券自定义名称
+        /// </summary>
+        public string CouponsName { get; set; }
+
+        /// <summary>
+        /// 优惠券自定义图片
+        /// </summary>
+        public string CouponsImg { get; set; }
+
+        /// <summary>
+        /// 卡券名称
+        /// </summary>
+        public string CardName { get; set; }
+
+        /// <summary>
+        /// 卡券图片
+        /// </summary>
+        public string CardImg { get; set; }
+
+        /// <summary>
+        /// 是否显示菜单栏(0-显示，1-不显示)
+        /// </summary>
+        public int IsShowMenuNav { get; set; }
+
+        /// <summary>
+        /// 菜单栏标题
+        /// </summary>
+        public string MenuNavTitle { get; set; }
+
+        /// <summary>
+        /// 菜单栏样式(0-列表,1-九宫格)
+        /// </summary>
+        public int MenuNavStyle { get; set; }
+
+        /// <summary>
+        /// 菜单栏JSON数据
+        /// </summary>
+        public string MenuNavJson { get; set; }
+    }
+}

Mall.Model/Extend/BaseSetUp/RB_Logistics_RulesRegion_Extend.cs

@@ -25,5 +25,10 @@ namespace Mall.Model.Extend.BaseSetUp
         /// 地区父级id
         /// </summary>
         public int ParentID { get; set; }
+
+        /// <summary>
+        /// 地区父级的父级id
+        /// </summary>
+        public int GrandpaID { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/RB_Coupon_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    /// <summary>
+    /// 优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Coupon_Extend : RB_Coupon
+    {
+
+    }
+}

Mall.Model/Extend/MarketingCenter/RB_Coupon_SelfMotionMember_Extend.cs

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

Mall.Model/Extend/MarketingCenter/RB_Coupon_SelfMotion_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    /// <summary>
+    /// 自动发放优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Coupon_SelfMotion_Extend: RB_Coupon_SelfMotion
+    {
+
+        public List<RB_Coupon_SelfMotionMember_Extend> UserList { get; set; }
+    }
+}

Mall.Model/Extend/MarketingCenter/RB_DiscountCoupon_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    /// <summary>
+    /// 优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_DiscountCoupon_Extend : RB_DiscountCoupon
+    {
+        /// <summary>
+        /// 商品/分类id
+        /// </summary>
+        public List<RB_DiscountCoupon_Product_Extend> ProductList { get; set; }
+
+        /// <summary>
+        /// 发放优惠券的时候会员id
+        /// </summary>
+        public string UserIds { get; set; }
+
+        /// <summary>
+        /// 发放数量
+        /// </summary>
+        public int GrantNum { get; set; }
+    }
+}

Mall.Model/Extend/MarketingCenter/RB_DiscountCoupon_Product_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    /// <summary>
+    /// 优惠券指定商品、分类扩展表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_DiscountCoupon_Product_Extend : RB_DiscountCoupon_Product
+    {
+        /// <summary>
+        /// 关联信息（商品图片/分类名称）
+        /// </summary>
+        public string Relevance { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Area.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 图片通用类
+    /// </summary>
+    [Serializable]
+    public class RB_ImageCommonModel 
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        public string Path { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Area_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品关联区域表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Area_Extend : RB_Goods_Area
+    {
+        /// <summary>
+        /// 区域名称
+        /// </summary>
+        public string AreaName { get; set; }
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Category_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品关联分类表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Category_Extend : RB_Goods_Category
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Extend : RB_Goods
+    {
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+        /// <summary>
+        /// 是否查询售罄   1是  其他否
+        /// </summary>
+        public int? IsSelectSellOut { get; set; }
+        /// <summary>
+        /// 分类ids
+        /// </summary>
+        public string CategoryIds { get; set; }
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+        /// <summary>
+        /// 封面图
+        /// </summary>
+        public string CoverImage { get; set; }
+        /// <summary>
+        /// 轮播图列表
+        /// </summary>
+        public List<RB_ImageCommonModel> CarouselImageList { get; set; }
+        /// <summary>
+        /// 服务列表
+        /// </summary>
+        public List<RB_ImageCommonModel> ServiceList { get; set; }
+        /// <summary>
+        /// 商品分类
+        /// </summary>
+        public List<RB_Goods_Category_Extend> CategoryList { get; set; }
+        /// <summary>
+        /// 区域列表
+        /// </summary>
+        public List<RB_Goods_Area_Extend> AreaList { get; set; }
+        /// <summary>
+        /// 规格名列表
+        /// </summary>
+        public List<RB_Goods_Specification_Extend> SpecificationList { get; set; }        
+        /// <summary>
+        /// 规格价格列表
+        /// </summary>
+        public List<RB_Goods_SpecificationPrice_Extend> SpecificationPriceList { get; set; }
+
+    }
+}

Mall.Model/Extend/Product/RB_Goods_SpecificationPrice_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品关联规格价格表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_SpecificationPrice_Extend : RB_Goods_SpecificationPrice
+    {
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_SpecificationValue_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品关联规格值表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_SpecificationValue_Extend : RB_Goods_SpecificationValue
+    {
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+        /// <summary>
+        /// 图片路径
+        /// </summary>
+        public string ImagePath { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Specification_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品关联规格表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Specification_Extend : RB_Goods_Specification
+    {
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+
+        /// <summary>
+        /// 规格值列表
+        /// </summary>
+        public List<RB_Goods_SpecificationValue_Extend> SpecificationValueList { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Product_QuickBuy_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品快速购买表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_QuickBuy_Extend : RB_Product_QuickBuy
+    {
+        /// <summary>
+        /// 图标
+        /// </summary>
+        public string IconPath { get; set; }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+        /// <summary>
+        /// 图标id
+        /// </summary>
+        public int? Icon { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Product_Recommend_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品推荐设置表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_Recommend_Extend : RB_Product_Recommend
+    {
+        /// <summary>
+        /// 订单完成后自定义推荐商品
+        /// </summary>
+        public List<RB_ProductRecommendModel> OrderProductList { get; set; }
+
+        /// <summary>
+        /// 评论后自定义推荐商品
+        /// </summary>
+        public List<RB_ProductRecommendModel> CommentProductList { get; set; }
+    }
+
+    /// <summary>
+    /// 商品选择
+    /// </summary>
+    public class RB_ProductRecommendModel { 
+        /// <summary>
+        /// 商品id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 商品图片
+        /// </summary>
+        public string Image { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Product_Service_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品服务表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_Service_Extend : RB_Product_Service
+    {
+        /// <summary>
+        /// 更新类型
+        /// </summary>
+        public int? UpdateType { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Product_Specification_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品规格表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_Specification_Extend : RB_Product_Specification
+    {
+        /// <summary>
+        /// 规格值列表
+        /// </summary>
+        public List<string> SpecList { get; set; }
+    }
+}

Mall.Model/Extend/User/RB_Distributor_Info_Extend.cs

@@ -73,5 +73,9 @@ namespace Mall.Model.Extend.User
         /// 下载枚举ids
         /// </summary>
         public List<int> ExcelEnumIds { get; set; }
+        /// <summary>
+        /// 第几级
+        /// </summary>
+        public int? ReferralsType { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Member_DiscountCoupon_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 会员优惠券扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Member_DiscountCoupon_Extend : RB_Member_DiscountCoupon
+    {
+
+    }
+}

Mall.Model/Extend/User/RB_MiniProgram_FenXiaoPoster_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 分销海报扩展实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_FenXiaoPoster_Extend : Model.Entity.User.RB_MiniProgram_FenXiaoPoster
+    {
+
+    }
+}

Mall.Model/Extend/User/RB_MiniProgram_GoodPoster_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 商品海报扩展实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_GoodPoster_Extend : Model.Entity.User.RB_MiniProgram_GoodPoster
+    {
+    }
+}

Mall.Model/Extend/User/RB_MiniProgram_UserCenterConfig_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 小程序用户中心配置扩展实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_UserCenterConfig_Extend : Model.Entity.User.RB_MiniProgram_UserCenterConfig
+    {
+
+    }
+}

Mall.Module.BaseSetUp/MallBaseModule.cs

@@ -532,10 +532,10 @@ namespace Mall.Module.BaseSetUp
                 }
                 if (model.List != null && model.List.Any())
                 {
-                    model.List.ForEach(x => x.TenantId = rulesId);
+                    model.List.ForEach(x => x.TenantId = model.TenantId);
                     model.List.ForEach(x => x.CreateDate = System.DateTime.Now);
                     model.List.ForEach(x => x.ID = 0);
-                    model.List.ForEach(x => x.RulesPriceId = model.TenantId);
+                    model.List.ForEach(x => x.RulesPriceId =rulesId);
                     model.List.ForEach(x => x.RulesType = model.RulesType);
                     model.List.ForEach(x => x.MallBaseId = model.MallBaseId);
                     flag = logisticsRulesRegionRepository.InsertBatch(model.List, trans);

Mall.Module.MarketingCenter/IntegralModule.cs

@@ -88,6 +88,20 @@ namespace Mall.Module.MarketingCenter
             return recordRepository.GetList(dmodel);
 
         }
+
+
+        /// <summary>
+        /// 数据统计-积分收支
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<Integral_Query> GetExportIntegraStatisticslList(Integral_Query query)
+        {
+            return recordRepository.GetExportIntegraStatisticslList(query);
+        }
         #endregion
     }
 }

Mall.Module.User/MiniProgramUserCenterConfigModule.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Extend.User;
+using Mall.Repository;
+using Mall.Repository.User;
+
+namespace Mall.Module.User
+{
+    /// <summary>
+    /// 小程序用户中心配置处理类
+    /// </summary>
+    public class MiniProgramUserCenterConfigModule
+    {
+        /// <summary>
+        /// 小程序用户中心配置仓储层对象
+        /// </summary>
+        private RB_MiniProgram_UserCenterConfigRepository configRepository = new RB_MiniProgram_UserCenterConfigRepository();
+
+        /// <summary>
+        /// 根据查询条件获取小程序用户中心配置实体
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public RB_MiniProgram_UserCenterConfig_Extend GetUserCenterConfigModule(RB_MiniProgram_UserCenterConfig_Extend query)
+        {
+            var extModel = configRepository.GetEntityExtRepository(query);
+            if (extModel == null)
+            {
+                extModel = new RB_MiniProgram_UserCenterConfig_Extend();
+            }
+            return extModel;
+        }
+
+        /// <summary>
+        /// 添加修改用户中心配置信息
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiniUserCenterConfigModule(RB_MiniProgram_UserCenterConfig_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.DefaultBgImg),extModel.DefaultBgImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.MemberBgImg),extModel.MemberBgImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.VipBgImg),extModel.VipBgImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.HeadStyle),extModel.HeadStyle},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.HeadStyleStr),extModel.HeadStyleStr},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.IsShowFavorite),extModel.IsShowFavorite},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.MyFavoriteImg),extModel.MyFavoriteImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.MyFootPrintImg),extModel.MyFootPrintImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.IsShowOrderNav),extModel.IsShowOrderNav},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.NoPayImg),extModel.NoPayImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.NoDeliveryImg),extModel.NoDeliveryImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.NoReciveImg),extModel.NoReciveImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.NoEvaluation),extModel.NoEvaluation},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.AfterSales),extModel.AfterSales},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.IsShowAccountNav),extModel.IsShowAccountNav},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.IntegralName),extModel.IntegralName},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.IntegralImg),extModel.IntegralImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.BalanceName),extModel.BalanceName},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.BalanceImg),extModel.BalanceImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.CouponsName),extModel.CouponsName},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.CouponsImg),extModel.CouponsImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.CardName),extModel.CardName},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.CardImg),extModel.CardImg},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.IsShowMenuNav),extModel.IsShowMenuNav},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.MenuNavTitle),extModel.MenuNavTitle},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.MenuNavStyle),extModel.MenuNavStyle},
+                    { nameof(RB_MiniProgram_UserCenterConfig_Extend.MenuNavJson),extModel.MenuNavJson},
+                };
+                flag = configRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_UserCenterConfig_Extend.Id), extModel.Id));
+            }
+            else
+            {
+                int NewId = configRepository.Insert(extModel);
+                extModel.Id = NewId;
+                flag = NewId > 0;
+            }
+            return flag;
+        }
+    }
+}

Mall.Module.User/PosterModule.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Extend.User;
+using Mall.Repository;
+using Mall.Repository.User;
+
+
+namespace Mall.Module.User
+{
+    /// <summary>
+    /// 海报处理类
+    /// </summary>
+    public class PosterModule
+    {
+        /// <summary>
+        /// 分销海报仓储层对象
+        /// </summary>
+        private RB_MiniProgram_FenXiaoPosterRepository fenXiaoPosterRepository = new RB_MiniProgram_FenXiaoPosterRepository();
+
+
+        /// <summary>
+        /// 商品分销仓储层对象
+        /// </summary>
+        private RB_MiniProgram_GoodPosterRepository goodPosterRepository = new RB_MiniProgram_GoodPosterRepository();
+
+        /// <summary>
+        /// 根据查询条件获取分销海报实体
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public RB_MiniProgram_FenXiaoPoster_Extend GetFenXiaoPosterEntityModule(RB_MiniProgram_FenXiaoPoster_Extend query)
+        {
+            return fenXiaoPosterRepository.GetEntityExtRepository(query);
+        }
+
+        /// <summary>
+        /// 添加修改分销海报
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetFenXiaoPosterModule(RB_MiniProgram_FenXiaoPoster_Extend extModel) 
+        {
+            bool flag = false;
+            if (extModel.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.PosterBgImg),extModel.PosterBgImg},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.IsShowHead),extModel.IsShowHead},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.HeadSize),extModel.HeadSize},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.HeadPaddingTop),extModel.HeadPaddingTop},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.HeadPaddingLeft),extModel.HeadPaddingLeft},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.IsShowNick),extModel.IsShowNick},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.NickSize),extModel.NickSize},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.NickPaddingTop),extModel.NickPaddingTop},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.NickPaddingLeft),extModel.NickPaddingLeft},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.IsShowQrCode),extModel.IsShowQrCode},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.QrCodeSize),extModel.QrCodeSize},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.QrCodePaddingTop),extModel.QrCodePaddingTop},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.QrCodePaddingLeft),extModel.QrCodePaddingLeft},
+                };
+                flag = fenXiaoPosterRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_FenXiaoPoster_Extend.Id), extModel.Id));
+            }
+            else
+            {
+                int NewId = fenXiaoPosterRepository.Insert(extModel);
+                extModel.Id = NewId;
+                flag = NewId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据查询条件获取商品海报实体
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public RB_MiniProgram_GoodPoster_Extend GetGoodPosterEntityModule(RB_MiniProgram_GoodPoster_Extend query)
+        {
+            return goodPosterRepository.GetEntityExtRepository(query);
+        }
+
+        /// <summary>
+        /// 添加修改商品海报
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetGoodPosterModule(RB_MiniProgram_GoodPoster_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_GoodPoster_Extend.IsShowNick),extModel.IsShowNick},
+                    { nameof(RB_MiniProgram_GoodPoster_Extend.IsShowGoodsDes),extModel.IsShowGoodsDes},
+                    { nameof(RB_MiniProgram_GoodPoster_Extend.IsShowGoodsInfo),extModel.IsShowGoodsInfo},
+                    { nameof(RB_MiniProgram_GoodPoster_Extend.GoodsImgCount),extModel.GoodsImgCount},
+                };
+                flag = goodPosterRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_GoodPoster_Extend.Id), extModel.Id));
+            }
+            else
+            {
+                int NewId = goodPosterRepository.Insert(extModel);
+                extModel.Id = NewId;
+                flag = NewId > 0;
+            }
+            return flag;
+        }
+    }
+}

Mall.Module.User/UserCommonModule.cs

@@ -32,6 +32,10 @@ namespace Mall.Module.User
         /// 分类样式
         /// </summary>
         private readonly RB_Product_CategoryStyleRepository product_CategoryStyleRepository = new RB_Product_CategoryStyleRepository();
+        /// <summary>
+        /// 推荐设置
+        /// </summary>
+        private readonly RB_Product_RecommendRepository product_RecommendRepository = new RB_Product_RecommendRepository();
 
         /// <summary>
         /// 初始化分销基础配置
@@ -162,5 +166,37 @@ namespace Mall.Module.User
                 return true;
             }
         }
+
+        /// <summary>
+        /// 初始化商品推荐设置
+        /// </summary>
+        /// <param name="TenantId"></param>
+        /// <param name="MallBaseId"></param>
+        /// <returns></returns>
+        public bool InitializeProductRecommendInfo(int TenantId, int MallBaseId) {
+            var oModel = product_RecommendRepository.GetList(new RB_Product_Recommend_Extend() { TenantId = TenantId, MallBaseId = MallBaseId }).FirstOrDefault();
+            if (oModel == null)
+            {
+                return product_RecommendRepository.Insert(new Model.Entity.Product.RB_Product_Recommend()
+                {
+                    Id = 0,
+                    CommentProductIds = "",
+                    CommentRecommentStatus = 1,
+                    CreateDate = DateTime.Now,
+                    DetailRecommendNum = 6,
+                    DetailRecommendStatus = 1,
+                    IsCommentRecommend = 2,
+                    IsOrderRecommend = 2,
+                    MallBaseId = MallBaseId,
+                    OrderCompleteStatus = 1,
+                    OrderProductIds = "",
+                    TenantId = TenantId,
+                    UpdateDate = DateTime.Now
+                }) > 0;
+            }
+            else {
+                return true;
+            }
+        }
     }
 }

Mall.Module.User/UserModule.cs

@@ -788,6 +788,13 @@ namespace Mall.Module.User
                 {
                     return false;
                 }
+                if (model.Enabled == 1 && demodel.Enabled == 2) {
+                    //验证是否有分销商在使用该等级
+                    if (ValidateDistributorGradeEnabled(model.Id))
+                    {
+                        return false;
+                    }
+                }
 
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                     { nameof(RB_Distributor_Grade.CommissionWithdrawn),demodel.CommissionWithdrawn},
@@ -829,6 +836,17 @@ namespace Mall.Module.User
             }
         }
 
+        /// <summary>
+        /// 获取分销等级下拉列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Distributor_Grade_Extend> GetDistributorGradeDropdownList(RB_Distributor_Grade_Extend demodel)
+        {
+            var list = distributor_GradeRepository.GetList(demodel);
+            return list;
+        }
+
         /// <summary>
         /// 删除
         /// </summary>
@@ -869,6 +887,54 @@ namespace Mall.Module.User
             return distributor_GradeRepository.Update(keyValues, whereHelpers);
         }
 
+        /// <summary>
+        /// 验证分销商等级使用
+        /// </summary>
+        /// <param name="gradeId"></param>
+        /// <returns></returns>
+        public bool ValidateDistributorGradeEnabled(int gradeId)
+        {
+            List<WhereHelper> whereHelpers = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Distributor_Info.GradeId),
+                        FiledValue=gradeId,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Distributor_Info.Status),
+                        FiledValue=0,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Distributor_Info.AuditStatus),
+                        FiledValue=2,
+                        OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            return distributor_InfoRepository.Exists(whereHelpers);
+        }
+
+        /// <summary>
+        /// 修改分销商等级启用
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetDistributorGradeEnabledStatus(RB_Distributor_Grade model)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Distributor_Grade.Enabled),model.Enabled==1?2:1},
+                { nameof(RB_Distributor_Grade.UpdateDate),DateTime.Now}
+            };
+            List<WhereHelper> whereHelpers = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Distributor_Grade.Id),
+                        FiledValue=model.Id,
+                        OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            return distributor_GradeRepository.Update(keyValues, whereHelpers);
+        }
+
         /// <summary>
         /// 获取分销商等级信息
         /// </summary>
@@ -1013,6 +1079,17 @@ namespace Mall.Module.User
             return "";
         }
 
+        /// <summary>
+        /// 获取下级用户列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Member_User_Extend> GetDistributorInfoReferralsPageList(RB_Distributor_Info_Extend demodel)
+        {
+            var list = member_UserRepository.GetDistributorReferralsPageList(demodel.UserId, demodel.ReferralsType, demodel.TenantId, demodel.MallBaseId);
+            return list;
+        }
+
         /// <summary>
         /// 分销商审核+修改等级
         /// </summary>

Mall.Repository/BaseSetUp/RB_Logistics_RulesRegionRepository.cs

@@ -27,7 +27,9 @@ namespace Mall.Repository.BaseSetUp
         public List<RB_Logistics_RulesRegion_Extend> GetListRepository(RB_Logistics_RulesRegion_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT a.*,b.`Name` as RegionName,b.ParentID FROM {TableName} as a LEFT JOIN {DestinationTableName} as b on a.RegionId=b.ID WHERE   a.{nameof(RB_Logistics_RulesRegion_Extend.Status)}=0");
+            builder.Append(@$" SELECT a.*,b.`Name` as RegionName,b.ParentID,c.ParentID as GrandpaID FROM {TableName} as a 
+LEFT JOIN {DestinationTableName} as b on a.RegionId = b.ID
+LEFT JOIN {DestinationTableName} as c on b.ParentID = c.ID WHERE   a.{nameof(RB_Logistics_RulesRegion_Extend.Status)}=0");
             if (query != null)
             {
                 if (query.TenantId > 0)
@@ -38,7 +40,7 @@ namespace Mall.Repository.BaseSetUp
                 {
                     builder.Append($" AND a.{nameof(RB_Logistics_RulesRegion_Extend.RulesType)}={(int)query.RulesType}");
                 }
-                if (query.TenantId > 0)
+                if (query.MallBaseId > 0)
                 {
                     builder.Append($" AND a.{nameof(RB_Logistics_RulesRegion_Extend.MallBaseId)}={query.MallBaseId}");
                 }

Mall.Repository/MarketingCenter/RB_CouponRepository.cs

+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.MarketingCenter
+{
+    /// <summary>
+    /// 优惠券仓储层
+    /// </summary>
+    public class RB_CouponRepository : RepositoryBase<RB_Coupon>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Coupon); } }
+        /// <summary>
+        /// 卡券信息列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Coupon_Extend> GetCouponPageList(int pageIndex, int pageSize, out long rowCount, RB_Coupon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Coupon_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            return GetPage<RB_Coupon_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 卡券信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Coupon_Extend> GetCouponList(RB_Coupon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Coupon_Extend.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_Extend.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            return Get<RB_Coupon_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/MarketingCenter/RB_Coupon_SelfMotionMemberRepository.cs

+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.MarketingCenter
+{
+    public class RB_Coupon_SelfMotionMemberRepository : RepositoryBase<RB_Coupon_SelfMotionMember>
+    {
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Coupon_SelfMotionMember); } }
+
+        // <summary>
+        /// 表名称
+        /// </summary>
+        public string UserTableName { get { return nameof(RB_Member_User); } }
+
+        /// <summary>
+        /// 获取物流地区列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Coupon_SelfMotionMember_Extend> GetListRepository(RB_Coupon_SelfMotionMember_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@$" SELECT a.*,b.`Name`,b.Photo as GrandpaID FROM {TableName} as a 
+LEFT JOIN {UserTableName} as b on a.UserId = b.ID WHERE   a.{nameof(RB_Coupon_SelfMotionMember_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Coupon_SelfMotionMember_Extend.TenantId)}={query.TenantId}");
+                }
+
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Coupon_SelfMotionMember_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.SelfMotionId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Coupon_SelfMotionMember_Extend.SelfMotionId)}={query.SelfMotionId}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Coupon_SelfMotionMember_Extend.UserId)}={query.UserId}");
+                }
+                //if (!string.IsNullOrWhiteSpace(query.PriceIds))
+                //{
+                //    builder.Append($" AND a.{nameof(RB_Coupon_SelfMotionMember_Extend.RulesPriceId)} in ({query.PriceIds})");
+                //}
+            }
+            return Get<RB_Coupon_SelfMotionMember_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/MarketingCenter/RB_Coupon_SelfMotionRepository.cs

+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.MarketingCenter
+{
+    /// <summary>
+    /// 自动发放优惠券仓储层
+    /// </summary>
+    public class RB_Coupon_SelfMotionRepository : RepositoryBase<RB_Coupon_SelfMotion>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Coupon_SelfMotion); } }
+        /// <summary>
+        /// 自动发放优惠券规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Coupon_SelfMotion_Extend> GetSelfMotionPageLis(int pageIndex, int pageSize, out long rowCount, RB_Coupon_SelfMotion_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Coupon_SelfMotion_Extend.Status)}=0");
+            if (query != null)
+            {
+                // where += $@" and {nameof(RB_Customer_InfoCreate.CustomerId)}={dmodel.CustomerId}";
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_SelfMotion_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_SelfMotion_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.DiscountCouponId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Coupon_SelfMotion_Extend.DiscountCouponId)}={query.DiscountCouponId}");
+                }
+            }
+            return GetPage<RB_Coupon_SelfMotion_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_Coupon_SelfMotion_Extend> GettRepositoryList(RB_Coupon_SelfMotion_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Coupon_SelfMotion_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_Coupon_SelfMotion_Extend.TenantId)}={query.TenantId}");
+                    }
+                    if (query.TenantId > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Coupon_SelfMotion_Extend.MallBaseId)}={query.MallBaseId}");
+                    }
+                    if (query.DiscountCouponId > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Coupon_SelfMotion_Extend.DiscountCouponId)}={query.DiscountCouponId}");
+                    }
+                }
+            }
+            return Get<RB_Coupon_SelfMotion_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.MarketingCenter
+{
+   public class RB_DiscountCouponRepository:RepositoryBase<RB_DiscountCoupon>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_DiscountCoupon); } }
+        /// <summary>
+        /// 卡券信息列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_DiscountCoupon_Extend> GetDiscountCouponPageList(int pageIndex, int pageSize, out long rowCount, RB_DiscountCoupon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_DiscountCoupon_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            return GetPage<RB_DiscountCoupon_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 卡券信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_DiscountCoupon_Extend> GetDiscountCouponList(RB_DiscountCoupon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_DiscountCoupon_Extend.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            return Get<RB_DiscountCoupon_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Goods_AreaRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品关联区域仓储层
+    /// </summary>
+    public class RB_Goods_AreaRepository : RepositoryBase<RB_Goods_Area>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_Area_Extend> GetList(RB_Goods_Area_Extend dmodel)
+        {
+            string where = $" 1=1 and ga.{nameof(RB_Goods_Area.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and ga.{nameof(RB_Goods_Area.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and ga.{nameof(RB_Goods_Area.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and ga.{nameof(RB_Goods_Area.Id)}={dmodel.Id}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and ga.{nameof(RB_Goods_Area.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and ga.{nameof(RB_Goods_Area.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            
+            string sql = $@"select ga.*,d.Name as AreaName from RB_Goods_Area ga
+inner join rb_destination d on ga.AreaId=d.ID
+where {where} order by ga.Id desc";
+            return Get<RB_Goods_Area_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_Member_BalanceRepository.cs

@@ -123,5 +123,8 @@ namespace Mall.Repository.User
             }
             return GetPage<RB_Member_Balance_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
+
+
+
     }
 }

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -402,7 +402,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 {
                     return ApiResult.Failed("请输入包邮名称");
                 }
-                if (query.AllRegionPrice > -1)
+                if (query.AllRegionPrice <= -1)
                 {
                     return ApiResult.Failed("包邮费用不能为负数");
                 }