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/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/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/CouponModule.cs

+using Mall.Common.Plugin;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.MarketingCenter;
+using Mall.Repository;
+using Mall.Repository.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Module.MarketingCenter
+{
+    public class CouponModule
+    {
+        private RB_CouponRepository couponRepository = new RB_CouponRepository();
+        private RB_DiscountCouponRepository discountCouponRepository = new RB_DiscountCouponRepository();
+        private RB_DiscountCoupon_ProductRepository productRepository = new RB_DiscountCoupon_ProductRepository();
+
+
+        private Repository.User.RB_Member_CouponRepository memberCouponRepository = new Repository.User.RB_Member_CouponRepository();
+        private RB_Coupon_SelfMotionMemberRepository selfMotionMemberRepository = new RB_Coupon_SelfMotionMemberRepository();
+
+        private RB_Coupon_SelfMotionRepository selfMotionRepository = new RB_Coupon_SelfMotionRepository();
+
+        #region 卡券列表
+        /// <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)
+        {
+            return couponRepository.GetCouponPageList(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 卡券信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Coupon_Extend> GetCouponList(RB_Coupon_Extend query)
+        {
+            return couponRepository.GetCouponList(query);
+
+        }
+
+        public bool AddOrUpdateCoupon(RB_Coupon_Extend model)
+        {
+            if (model.ID == 0)
+            {
+                return couponRepository.Insert(model) > 0;
+            }
+            else
+            {
+                return couponRepository.Update(model);
+            }
+        }
+
+
+        /// <summary>
+        /// 删除卡券
+        /// </summary>
+        /// <param name="gradeId"></param>
+        /// <param name="uid"></param>
+        /// <returns></returns>
+        public bool DelCoupon(int id, int uid, int mallBaseId)
+        {
+            try
+            {
+                Dictionary<string, object> cols = new Dictionary<string, object>()
+                {
+                    { nameof(RB_Coupon.Status),1},
+                    { nameof(RB_Coupon.UpdateDate),DateTime.Now},
+                };
+                List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon.ID),
+                        FiledValue=id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon.TenantId),
+                        FiledValue=Convert.ToInt32(uid),
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon.MallBaseId),
+                        FiledValue=Convert.ToInt32(mallBaseId),
+                        OperatorEnum=OperatorEnum.Equal
+                }
+            };
+                return couponRepository.Update(cols, wheres1);
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DelCoupon");
+                return false;
+            }
+        }
+
+
+
+        #endregion
+
+        #region 优惠券
+        /// <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)
+        {
+            return discountCouponRepository.GetDiscountCouponPageList(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 优惠券信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_DiscountCoupon_Extend> GetDiscountCouponList(RB_DiscountCoupon_Extend query)
+        {
+            var list = discountCouponRepository.GetDiscountCouponList(query);
+            if (list != null && list.Any())
+            {
+
+                string Ids = string.Join(",", list.Where(x => x.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Category || x.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Product).Select(x => x.ID));
+                var listProduct = productRepository.GetListByDiscountCouponIds(query, Ids);
+                foreach (var item in list)
+                {
+                    item.ProductList = new List<RB_DiscountCoupon_Product_Extend>();
+                    item.ProductList = listProduct.Where(x => x.DiscountCouponId == item.ID).ToList();
+                }
+            }
+            return list;
+
+        }
+
+        /// <summary>
+        /// 新增/修改优惠券
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool AddOrUpdateDiscountCoupon(RB_DiscountCoupon_Extend model)
+        {
+            bool flag = false;
+            var trans = discountCouponRepository.DbTransaction;
+            try
+            {
+                int id = 0;
+                if (model.ID == 0)
+                {
+                    id = discountCouponRepository.Insert(model, trans);
+                    if (id > 0 && model.ProductList != null && model.ProductList.Any())
+                    {
+                        model.ProductList.ForEach(x => x.MallBaseId = model.MallBaseId);
+                        model.ProductList.ForEach(x => x.TenantId = model.TenantId);
+                        model.ProductList.ForEach(x => x.CreateDate = model.CreateDate);
+                        model.ProductList.ForEach(x => x.UpdateDate = model.UpdateDate);
+                        model.ProductList.ForEach(x => x.DiscountCouponId = id);
+                        flag = productRepository.InsertBatch(model.ProductList, trans);
+                    }
+                    flag = id > 0;
+                }
+                else
+                {
+                    id = model.ID;
+                    flag = discountCouponRepository.Update(model, trans);
+                    var listProduct = productRepository.GetCouponProductList(new RB_DiscountCoupon_Product { TenantId = model.TenantId, MallBaseId = model.MallBaseId, DiscountCouponId = id });
+                    if (listProduct != null && listProduct.Any())
+                    {
+                        foreach (var item in model.ProductList)
+                        {
+                            IDictionary<string, object> fileds = new Dictionary<string, object>()
+                         {
+                            { nameof(RB_DiscountCoupon_Product.Status),1},
+                             { nameof(RB_DiscountCoupon_Product.UpdateDate),model.UpdateDate},
+                          };
+                            IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                        {
+                            new WhereHelper (){ FiledName=nameof(RB_DiscountCoupon_Product.ID),FiledValue=item.ID,OperatorEnum=OperatorEnum.Equal}
+                        };
+                            flag = productRepository.Update(fileds, whereHelpers, trans);
+                        }
+                    }
+
+                    if (model.ProductList != null && model.ProductList.Any())
+                    {
+                        model.ProductList.ForEach(x => x.MallBaseId = model.MallBaseId);
+                        model.ProductList.ForEach(x => x.TenantId = model.TenantId);
+                        model.ProductList.ForEach(x => x.CreateDate = model.CreateDate);
+                        model.ProductList.ForEach(x => x.UpdateDate = model.UpdateDate);
+                        model.ProductList.ForEach(x => x.DiscountCouponId = id);
+                        flag = productRepository.InsertBatch(model.ProductList, trans);
+                    }
+                }
+                discountCouponRepository.DBSession.Commit();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "AddOrUpdateDiscountCoupon");
+                discountCouponRepository.DBSession.Rollback("AddOrUpdateDiscountCoupon");
+                return false;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 删除优惠券
+        /// </summary>
+        /// <param name="gradeId"></param>
+        /// <param name="uid"></param>
+        /// <returns></returns>
+        public bool DelDiscountCoupon(int id, int uid, int mallBaseId)
+        {
+            bool flag = false;
+            var trans = discountCouponRepository.DbTransaction;
+            try
+            {
+                Dictionary<string, object> cols1 = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_DiscountCoupon.Status),1},
+                        { nameof(RB_DiscountCoupon.UpdateDate),DateTime.Now},
+                    };
+                List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon.ID),
+                        FiledValue=id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon.TenantId),
+                        FiledValue=Convert.ToInt32(uid),
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon.MallBaseId),
+                        FiledValue=Convert.ToInt32(mallBaseId),
+                        OperatorEnum=OperatorEnum.Equal
+                }
+                };
+                flag = discountCouponRepository.Update(cols1, wheres1);
+
+                Dictionary<string, object> cols = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_DiscountCoupon_Product.Status),1},
+                        { nameof(RB_DiscountCoupon_Product.UpdateDate),DateTime.Now},
+                    };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon_Product.DiscountCouponId),
+                        FiledValue=id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon_Product.TenantId),
+                        FiledValue=Convert.ToInt32(uid),
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon_Product.MallBaseId),
+                        FiledValue=Convert.ToInt32(mallBaseId),
+                        OperatorEnum=OperatorEnum.Equal
+                }
+                };
+                flag = productRepository.Update(cols, wheres);
+
+
+                discountCouponRepository.DBSession.Commit();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DelDiscountCoupon");
+                discountCouponRepository.DBSession.Rollback("DelDiscountCoupon");
+                return false;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 领劵中心
+        /// </summary>
+        /// <param name="gradeId"></param>
+        /// <param name="uid"></param>
+        /// <returns></returns>
+        public bool UpdatePickupType(int id, int uid, int mallBaseId)
+        {
+            try
+            {
+                var model = discountCouponRepository.GetEntity(id);
+
+                Dictionary<string, object> cols1 = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_DiscountCoupon.PickupType),model.PickupType==Common.Enum.MarketingCenter.PickupTypeEnum.CouponCenter?Common.Enum.MarketingCenter.PickupTypeEnum.OnlyMember:Common.Enum.MarketingCenter.PickupTypeEnum.CouponCenter},
+                        { nameof(RB_DiscountCoupon.UpdateDate),DateTime.Now},
+                    };
+                List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon.ID),
+                        FiledValue=id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon.TenantId),
+                        FiledValue=Convert.ToInt32(uid),
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_DiscountCoupon.MallBaseId),
+                        FiledValue=Convert.ToInt32(mallBaseId),
+                        OperatorEnum=OperatorEnum.Equal
+                }
+                };
+                return discountCouponRepository.Update(cols1, wheres1);
+
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "UpdatePickupType");
+                return false;
+            }
+        }
+
+
+
+        /// <summary>
+        /// 发放优惠券
+        /// </summary>
+        /// <param name="list"></param>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool GrantCoupon(List<RB_Member_DiscountCoupon> list, RB_DiscountCoupon_Extend model)
+        {
+            bool flag = false;
+            var trans = memberCouponRepository.DbTransaction;
+            try
+            {
+
+                flag = memberCouponRepository.InsertBatch(list);
+                if (model != null && flag)
+                {
+                    Dictionary<string, object> cols1 = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_DiscountCoupon.ReceiveNum),model.ReceiveNum+list.Count()},
+                        { nameof(RB_DiscountCoupon.UpdateDate),DateTime.Now},
+                    };
+                    List<WhereHelper> wheres1 = new List<WhereHelper>()
+                    {
+                    new WhereHelper(){
+                            FiledName=nameof(RB_DiscountCoupon.ID),
+                            FiledValue=model.ID,
+                            OperatorEnum=OperatorEnum.Equal
+                    },
+                    new WhereHelper(){
+                            FiledName=nameof(RB_DiscountCoupon.TenantId),
+                            FiledValue=model.TenantId,
+                            OperatorEnum=OperatorEnum.Equal
+                    },
+                    new WhereHelper(){
+                            FiledName=nameof(RB_DiscountCoupon.MallBaseId),
+                            FiledValue=model.MallBaseId,
+                            OperatorEnum=OperatorEnum.Equal
+                    }
+                    };
+                    flag = discountCouponRepository.Update(cols1, wheres1);
+                }
+                memberCouponRepository.DBSession.Commit();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "GrantCoupon");
+                memberCouponRepository.DBSession.Rollback("GrantCoupon");
+                return false;
+            }
+            return flag;
+        }
+        #endregion
+
+        #region 自动发放优惠券规则
+        /// <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)
+        {
+            return selfMotionRepository.GetSelfMotionPageLis(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <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)
+        {
+            return selfMotionRepository.GettRepositoryList(query);
+        }
+
+        /// <summary>
+        /// 新增/修改自动发放优惠券
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool AddOrUpdateSelfMotion(RB_Coupon_SelfMotion_Extend model)
+        {
+            bool flag = false;
+            var trans = selfMotionRepository.DbTransaction;
+            try
+            {
+                int id = 0;
+                if (model.ID == 0)
+                {
+                    id = selfMotionRepository.Insert(model, trans);
+                    if (id > 0 && model.UserList != null && model.UserList.Any())
+                    {
+                        model.UserList.ForEach(x => x.MallBaseId = model.MallBaseId);
+                        model.UserList.ForEach(x => x.TenantId = model.TenantId);
+                        model.UserList.ForEach(x => x.CreateDate = model.CreateDate);
+                        model.UserList.ForEach(x => x.UpdateDate = model.UpdateDate);
+                        model.UserList.ForEach(x => x.SelfMotionId = id);
+                        flag = selfMotionMemberRepository.InsertBatch(model.UserList, trans);
+                    }
+                    flag = id > 0;
+                }
+                else
+                {
+                    id = model.ID;
+                    flag = selfMotionRepository.Update(model, trans);
+                    var listProduct = selfMotionMemberRepository.GetListRepository(new  RB_Coupon_SelfMotionMember_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, SelfMotionId = id });
+                    if (listProduct != null && listProduct.Any())
+                    {
+                        foreach (var item in model.UserList)
+                        {
+                            IDictionary<string, object> fileds = new Dictionary<string, object>()
+                         {
+                            { nameof(RB_Coupon_SelfMotionMember.Status),1},
+                             { nameof(RB_Coupon_SelfMotionMember.UpdateDate),model.UpdateDate},
+                          };
+                            IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                        {
+                            new WhereHelper (){ FiledName=nameof(RB_Coupon_SelfMotionMember.ID),FiledValue=item.ID,OperatorEnum=OperatorEnum.Equal}
+                        };
+                            flag = productRepository.Update(fileds, whereHelpers, trans);
+                        }
+                    }
+
+                    if (model.UserList != null && model.UserList.Any())
+                    {
+                        model.UserList.ForEach(x => x.MallBaseId = model.MallBaseId);
+                        model.UserList.ForEach(x => x.TenantId = model.TenantId);
+                        model.UserList.ForEach(x => x.CreateDate = model.CreateDate);
+                        model.UserList.ForEach(x => x.UpdateDate = model.UpdateDate);
+                        model.UserList.ForEach(x => x.SelfMotionId = id);
+                        flag = selfMotionMemberRepository.InsertBatch(model.UserList, trans);
+                    }
+                }
+                selfMotionRepository.DBSession.Commit();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "AddOrUpdateSelfMotion");
+                selfMotionRepository.DBSession.Rollback("AddOrUpdateSelfMotion");
+                return false;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 删除自动发放优惠券
+        /// </summary>
+        /// <param name="gradeId"></param>
+        /// <param name="uid"></param>
+        /// <returns></returns>
+        public bool DelDiscountSelfMotion(int id, int uid, int mallBaseId)
+        {
+            bool flag = false;
+            var trans = selfMotionRepository.DbTransaction;
+            try
+            {
+                Dictionary<string, object> cols1 = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_Coupon_SelfMotion.Status),1},
+                        { nameof(RB_Coupon_SelfMotion.UpdateDate),DateTime.Now},
+                    };
+                List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon_SelfMotion.ID),
+                        FiledValue=id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon_SelfMotion.TenantId),
+                        FiledValue=Convert.ToInt32(uid),
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon_SelfMotion.MallBaseId),
+                        FiledValue=Convert.ToInt32(mallBaseId),
+                        OperatorEnum=OperatorEnum.Equal
+                }
+                };
+                flag = selfMotionRepository.Update(cols1, wheres1);
+
+                Dictionary<string, object> cols = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_Coupon_SelfMotionMember.Status),1},
+                        { nameof(RB_Coupon_SelfMotionMember.UpdateDate),DateTime.Now},
+                    };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon_SelfMotionMember.SelfMotionId),
+                        FiledValue=id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon_SelfMotionMember.TenantId),
+                        FiledValue=Convert.ToInt32(uid),
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Coupon_SelfMotionMember.MallBaseId),
+                        FiledValue=Convert.ToInt32(mallBaseId),
+                        OperatorEnum=OperatorEnum.Equal
+                }
+                };
+                flag = selfMotionMemberRepository.Update(cols, wheres);
+
+
+                selfMotionRepository.DBSession.Commit();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DelDiscountSelfMotion");
+                selfMotionRepository.DBSession.Rollback("DelDiscountSelfMotion");
+                return false;
+            }
+            return flag;
+        }
+
+     
+        #endregion
+
+
+    }
+}

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.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/MarketingCenter/RB_DiscountCoupon_ProductRepository.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_DiscountCoupon_ProductRepository : RepositoryBase<RB_DiscountCoupon_Product>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_DiscountCoupon_Product); } }
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string PCategoryTableName { get { return nameof(Model.Entity.Product.RB_Product_Category); } }
+
+        /// <summary>
+        /// 优惠券对应的商品/分类列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_DiscountCoupon_Product> GetCouponProductList(RB_DiscountCoupon_Product query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_DiscountCoupon_Product.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Product.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Product.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Product.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.DiscountCouponId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_DiscountCoupon_Product.DiscountCouponId)}={query.DiscountCouponId}");
+                }
+            }
+            return Get<RB_DiscountCoupon_Product>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 优惠券对应的商品/分类列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_DiscountCoupon_Product_Extend> GetListByDiscountCouponIds(RB_DiscountCoupon query, string DiscountCouponIds)
+        {
+            StringBuilder builder = new StringBuilder();
+
+            if (query != null)
+            {
+                
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_DiscountCoupon_Product.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_DiscountCoupon_Product.MallBaseId)}={query.MallBaseId}");
+                }
+            }
+            if (!string.IsNullOrWhiteSpace(DiscountCouponIds))
+            {
+                builder.Append($" AND a.{nameof(RB_DiscountCoupon_Product.DiscountCouponId)} in ({DiscountCouponIds})");
+            }
+            string sql = $"SELECT a.* from {TableName} as a  WHERE a.{nameof(RB_DiscountCoupon_Product.Status)}=0 {builder.ToString()}  ";
+            if (query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Category)
+            {
+                sql = $" SELECT a.*,b.`Name` as Relevance from {TableName} as a LEFT JOIN {PCategoryTableName} as b on a.ProductId=b.Id WHERE a.{nameof(RB_DiscountCoupon_Product.Status)}=0 {builder.ToString()} ";
+            }
+            else if (query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Product)
+            {
+                sql = $" SELECT a.*,b.`Name` as Relevance from {TableName} as a LEFT JOIN {PCategoryTableName} as b on a.ProductId=b.Id WHERE a.{nameof(RB_DiscountCoupon_Product.Status)}=0 {builder.ToString()} ";
+            }
+            return Get<RB_DiscountCoupon_Product_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.Repository/User/RB_Member_CouponRepository.cs

+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 会员优惠券仓储层
+    /// </summary>
+   public class RB_Member_CouponRepository:RepositoryBase<RB_Member_DiscountCoupon>
+    {
+        public string MemberTableName { get { return nameof(RB_Member_User); } }
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Member_DiscountCoupon); } }
+
+
+        /// <summary>
+        /// 会员优惠券
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Member_DiscountCoupon_Extend> GetIntegraStatisticslList(int pageIndex, int pageSize, out long rowCount, RB_Member_DiscountCoupon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_DiscountCoupon_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.PlatformType > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_DiscountCoupon_Extend.PlatformType)}={query.PlatformType}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_DiscountCoupon_Extend.UserId)}={query.UserId}");
+                }
+                //if (!string.IsNullOrWhiteSpace(query.StartDate))
+                //{
+                //    builder.Append($" AND DATE_FORMAT({nameof(RB_Member_Coupon_Extend.CreateDate)},'%Y-%m-%d' )>= DATE_FORMAT('{nameof(RB_Member_Coupon_Extend.StartDate)}','%Y-%m-%d' )");
+                //}
+                //if (!string.IsNullOrWhiteSpace(query.EndDate))
+                //{
+                //    builder.Append($" AND DATE_FORMAT({nameof(RB_Member_Coupon_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{nameof(RB_Member_Coupon_Extend.EndDate)}','%Y-%m-%d' )");
+                //}
+            }
+            string sql = @$" select * from {TableName} where 1=1 {builder.ToString()} ";
+            return GetPage<RB_Member_DiscountCoupon_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+
+        /// <summary>
+        /// 会员优惠券
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Member_DiscountCoupon_Extend> GetExportIntegraStatisticslList(RB_Member_DiscountCoupon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_DiscountCoupon_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.PlatformType > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_DiscountCoupon_Extend.PlatformType)}={query.PlatformType}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_DiscountCoupon_Extend.UserId)}={query.UserId}");
+                }
+            }
+            string sql = @$" select * from {TableName} where 1=1 {builder.ToString()} ";
+            return Get<RB_Member_DiscountCoupon_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_Member_IntegralRepository.cs

@@ -174,5 +174,48 @@ select DATE_FORMAT(CreateDate, '%Y-%m-%d') as CreateDate, 0 as Income, Integral
 ) as t GROUP BY CreateDate ";
             return GetPage<Integral_Query>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
+
+
+        /// <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)
+        {
+            StringBuilder builder = new StringBuilder();
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_Integral_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_Integral_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.PlatformType > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_Integral_Extend.PlatformType)}={query.PlatformType}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.StartDate))
+                {
+                    builder.Append($" AND DATE_FORMAT({nameof(RB_Member_Integral_Extend.CreateDate)},'%Y-%m-%d' )>= DATE_FORMAT('{nameof(RB_Member_Integral_Extend.StartDate)}','%Y-%m-%d' )");
+                }
+                if (!string.IsNullOrWhiteSpace(query.EndDate))
+                {
+                    builder.Append($" AND DATE_FORMAT({nameof(RB_Member_Integral_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{nameof(RB_Member_Integral_Extend.EndDate)}','%Y-%m-%d' )");
+                }
+            }
+            string sql = @$" SELECT CreateDate,SUM(Income) as Income, SUM(Expend) as Expend from (
+select DATE_FORMAT(CreateDate, '%Y-%m-%d') as CreateDate, Integral as Income, 0 as Expend from rb_member_integral where  Type = 1 {builder.ToString()}
+union all
+select DATE_FORMAT(CreateDate, '%Y-%m-%d') as CreateDate, 0 as Income, Integral as Expend from rb_member_integral where Type = 2 {builder.ToString()}
+) as t GROUP BY CreateDate ";
+            return Get<Integral_Query>(sql).ToList();
+        }
     }
 }

Mall.Repository/User/RB_MiniProgram_FenXiaoPosterRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 分销海报仓储层对象
+    /// </summary>
+    public class RB_MiniProgram_FenXiaoPosterRepository : RepositoryBase<RB_MiniProgram_FenXiaoPoster>
+    {
+        /// <summary>
+        /// 根据查询条件获取小程序用户中心配置实体
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public RB_MiniProgram_FenXiaoPoster_Extend GetEntityExtRepository(RB_MiniProgram_FenXiaoPoster_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram_FenXiaoPoster WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND TenantId={0} ", query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
+                }
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(" AND Id={0} ", query.Id);
+                }
+            }
+            return Get<RB_MiniProgram_FenXiaoPoster_Extend>(builder.ToString()).FirstOrDefault();
+        }
+    }
+}

Mall.Repository/User/RB_MiniProgram_GoodPosterRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 商品海报仓储层
+    /// </summary>
+    public class RB_MiniProgram_GoodPosterRepository : RepositoryBase<RB_MiniProgram_GoodPoster>
+    {
+        /// <summary>
+        /// 根据查询条件获取商品海报实体
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public RB_MiniProgram_GoodPoster_Extend GetEntityExtRepository(RB_MiniProgram_GoodPoster_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram_GoodPoster WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND TenantId={0} ", query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
+                }
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(" AND Id={0} ", query.Id);
+                }
+            }
+            return Get<RB_MiniProgram_GoodPoster_Extend>(builder.ToString()).FirstOrDefault();
+        }
+    }
+}

Mall.Repository/User/RB_MiniProgram_UserCenterConfigRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 小程序用户中心配置仓储层
+    /// </summary>
+    public class RB_MiniProgram_UserCenterConfigRepository : RepositoryBase<RB_MiniProgram_UserCenterConfig>
+    {
+        /// <summary>
+        /// 根据查询条件获取小程序用户中心配置实体
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public RB_MiniProgram_UserCenterConfig_Extend GetEntityExtRepository(RB_MiniProgram_UserCenterConfig_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram_UserCenterConfig WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND TenantId={0} ", query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
+                }
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(" AND Id={0} ", query.Id);
+                }
+            }
+            return Get<RB_MiniProgram_UserCenterConfig_Extend>(builder.ToString()).FirstOrDefault();
+        }
+    }
+}

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("包邮费用不能为负数");
                 }

Mall.WebApi/Controllers/MarketingCenter/CouponController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Mall.Common.API;
+using Mall.Common.Plugin;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.MarketingCenter;
+using Mall.Module.MarketingCenter;
+using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Mall.WebApi.Controllers.MarketingCenter
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class CouponController : BaseController
+    {
+        private CouponModule IntegralModule = new CouponModule();
+
+
+
+        #region 卡券
+
+        [HttpPost]
+        public ApiResult GetCouponPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Coupon_Extend demodel = JsonConvert.DeserializeObject<RB_Coupon_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = IntegralModule.GetCouponPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.Name,
+                x.HeXiao,
+                x.CouponIco,
+                x.StartDate,
+                x.IndateType,
+                x.IndateDay,
+                x.EndDate,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCouponDetail()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Coupon_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var oldLogisticsModel = IntegralModule.GetCouponList(query).FirstOrDefault();
+            if (oldLogisticsModel == null)
+            {
+                oldLogisticsModel = new RB_Coupon_Extend();
+                oldLogisticsModel.IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon;
+            }
+            return ApiResult.Success("", oldLogisticsModel);
+        }
+
+
+        /// <summary>
+        /// 保存物流信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult AddOrUpdateCoupon()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Coupon_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入卡券信息");
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(query.Name))
+                {
+                    return ApiResult.Failed("请输入卡券名称");
+                }
+                if (string.IsNullOrWhiteSpace(query.CouponIco))
+                {
+                    return ApiResult.Failed("请输入卡券图标");
+                }
+                if (query.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
+                {
+                    if (query.IndateDay == 0)
+                    {
+                        return ApiResult.Failed("请输入有效期天数");
+                    }
+                }
+                else
+                {
+                    if (!query.StartDate.HasValue || !query.EndDate.HasValue)
+                    {
+                        return ApiResult.Failed("开始日期或结束日期必填");
+                    }
+                    if (query.StartDate < query.EndDate)
+                    {
+                        return ApiResult.Failed("开始日期必须小于结束日期");
+                    }
+                }
+                if (query.HeXiao == 0)
+                {
+                    return ApiResult.Failed("请输入核销总次数");
+                }
+
+                if (query.TotalNum == 0)
+                {
+                    return ApiResult.Failed("请输入可发放数量");
+                }
+
+                if (string.IsNullOrWhiteSpace(query.Describe))
+                {
+                    return ApiResult.Failed("请输入卡券描述");
+                }
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+                }
+                query.UpdateDate = System.DateTime.Now;
+                bool result = IntegralModule.AddOrUpdateCoupon(query);
+                if (result)
+                {
+                    return ApiResult.Success("卡券信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("卡券信息保存失败");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 删除卡券
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelRules()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parmsJob.GetInt("Id", 0);
+            if (Id <= 0)
+            {
+                return ApiResult.Failed("请传递参数");
+            }
+            bool flag = IntegralModule.DelCoupon(Id, UserInfo.TenantId, parms.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+        #endregion
+
+        #region 优惠券
+
+        [HttpPost]
+        public ApiResult GetDiscountCouponPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_DiscountCoupon_Extend demodel = JsonConvert.DeserializeObject<RB_DiscountCoupon_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = IntegralModule.GetDiscountCouponPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.Name,
+                x.MinConsumePrice,
+                x.DiscountsPrice,
+                x.UseType,
+                x.CouponType,
+                x.StartDate,
+                x.IndateType,
+                x.IndateDay,
+                x.EndDate,
+                x.TotalNum,
+                ResidueNum = x.TotalNum - x.ReceiveNum,
+                x.PickupType
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDiscountCouponDetail()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_DiscountCoupon_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var oldLogisticsModel = IntegralModule.GetDiscountCouponList(query).FirstOrDefault();
+            if (oldLogisticsModel == null)
+            {
+                oldLogisticsModel = new RB_DiscountCoupon_Extend();
+                oldLogisticsModel.IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon;
+            }
+            return ApiResult.Success("", oldLogisticsModel);
+        }
+
+
+        /// <summary>
+        /// 保存优惠券
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult AddOrUpdateDiscountCoupon()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_DiscountCoupon_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入卡券信息");
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(query.Name))
+                {
+                    return ApiResult.Failed("请输入卡券名称");
+                }
+                if (query.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
+                {
+                    if (query.IndateDay == 0)
+                    {
+                        return ApiResult.Failed("请输入有效期天数");
+                    }
+                }
+                else
+                {
+                    if (!query.StartDate.HasValue || !query.EndDate.HasValue)
+                    {
+                        return ApiResult.Failed("开始日期或结束日期必填");
+                    }
+                    if (query.StartDate < query.EndDate)
+                    {
+                        return ApiResult.Failed("开始日期必须小于结束日期");
+                    }
+                }
+
+
+                if (query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Category || query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Product)
+                {
+                    if (query.ProductList == null || !query.ProductList.Any())
+                    {
+                        return ApiResult.Failed(query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Category ? "请选择商品类别" : "请选择商品");
+                    }
+                }
+                if (query.TotalNum == 0)
+                {
+                    return ApiResult.Failed("请输入可发放数量");
+                }
+
+                if (string.IsNullOrWhiteSpace(query.Describe))
+                {
+                    return ApiResult.Failed("请输入卡券描述");
+                }
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+                }
+                query.UpdateDate = System.DateTime.Now;
+                bool result = IntegralModule.AddOrUpdateDiscountCoupon(query);
+                if (result)
+                {
+                    return ApiResult.Success("优惠券信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("优惠券信息保存失败");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 删除优惠券
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelDiscountCoupon()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parmsJob.GetInt("Id", 0);
+            if (Id <= 0)
+            {
+                return ApiResult.Failed("请传递参数");
+            }
+            bool flag = IntegralModule.DelDiscountCoupon(Id, UserInfo.TenantId, parms.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 加入领劵中心
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult UpdatePickupType()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parmsJob.GetInt("Id", 0);
+            if (Id <= 0)
+            {
+                return ApiResult.Failed("请传递参数");
+            }
+            bool flag = IntegralModule.UpdatePickupType(Id, UserInfo.TenantId, parms.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success("操作成功");
+            }
+            else
+            {
+                return ApiResult.Failed("操作失败");
+            }
+        }
+
+
+        /// <summary>
+        /// 发放优惠券
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GrantCoupon()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_DiscountCoupon_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入卡券信息");
+            }
+            else
+            {
+                var oldLogisticsModel = IntegralModule.GetDiscountCouponList(query).FirstOrDefault();
+                if (oldLogisticsModel == null || oldLogisticsModel.ID == 0)
+                {
+                    return ApiResult.Failed("优惠券信息不存在，请核实后再操作");
+                }
+
+                List<RB_Member_DiscountCoupon> list = new List<RB_Member_DiscountCoupon>();
+                for (int i = 0; i < query.GrantNum; i++)
+                {
+                    foreach (var item in query.UserIds.Split(","))
+                    {
+                        if (!string.IsNullOrWhiteSpace(item))
+                        {
+                            RB_Member_DiscountCoupon memberCoupon = new RB_Member_DiscountCoupon();
+                            memberCoupon.Id = 0;
+                            memberCoupon.UserId = Convert.ToInt32(item);
+                            memberCoupon.Description = oldLogisticsModel.Describe;
+                            memberCoupon.CreateDate = System.DateTime.Now;
+                            memberCoupon.TenantId = oldLogisticsModel.TenantId;
+                            memberCoupon.MallBaseId = oldLogisticsModel.MallBaseId;
+                            memberCoupon.Remarks = "";
+                            memberCoupon.PlatformType = Common.Enum.MarketingCenter.PlatformTypeEnum.WeChat;
+                            memberCoupon.CouponId = oldLogisticsModel.ID;
+                            if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
+                            {
+                                memberCoupon.StartDate = System.DateTime.Now;
+                                memberCoupon.EndDate = memberCoupon.StartDate.Value.AddDays(oldLogisticsModel.IndateDay);
+                            }
+                            else
+                            {
+                                memberCoupon.StartDate = oldLogisticsModel.StartDate;
+                                memberCoupon.EndDate = oldLogisticsModel.EndDate;
+                            }
+                            list.Add(memberCoupon);
+                        }
+                    }
+                }
+                if (oldLogisticsModel.TotalNum != -1)
+                {
+                    if ((oldLogisticsModel.TotalNum - oldLogisticsModel.ReceiveNum) < list.Count())
+                    {
+                        return ApiResult.Failed("优惠券剩余" + (oldLogisticsModel.TotalNum - oldLogisticsModel.ReceiveNum) + "张");
+                    }
+                }
+                bool result = IntegralModule.GrantCoupon(list, oldLogisticsModel);
+                if (result)
+                {
+                    return ApiResult.Success("优惠券信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("优惠券信息保存失败");
+                }
+            }
+        }
+
+
+        #endregion
+    }
+}
\ No newline at end of file

Mall.WebApi/Controllers/MarketingCenter/IntegralController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Mall.Common.API;
+using Mall.Common.Plugin;
 using Mall.Model.Entity.MarketingCenter;
 using Mall.Model.Extend.MarketingCenter;
 using Mall.Model.Extend.User;
@@ -157,6 +158,64 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             }
             return ApiResult.Success("", new { model.Income, model.Expend });
         }
+
+
+        /// <summary>
+        /// 积分收支信息下载
+        /// </summary>
+        [HttpPost]
+        public FileContentResult GetIntegralListToExcel()
+        {
+            var parms = RequestParm;
+            Integral_Query demodel = JsonConvert.DeserializeObject<Integral_Query>(parms.msg.ToString());
+            string ExcelName = "积分收支" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            ExcelDataSource header = new ExcelDataSource()
+            {
+                ExcelRows = new List<ExcelColumn>(30) {
+                    new ExcelColumn(value: "序号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                     new ExcelColumn(value: "日期") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                      new ExcelColumn(value: "积分收入") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                       new ExcelColumn(value: "积分支出") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }
+                },
+            };
+            slist.Add(header);
+
+            try
+            {
+                demodel.TenantId = Convert.ToInt32(parms.uid);
+                demodel.MallBaseId = parms.MallBaseId;
+                var list = IntegralModule.GetExportIntegraStatisticslList(demodel);
+                #region 组装数据
+                int Num = 0;
+                foreach (var item in list)
+                {
+                    Num++;
+                    ExcelDataSource datarow = new ExcelDataSource()
+                    {
+                        ExcelRows = new List<ExcelColumn>(30) {
+                            new ExcelColumn(value:Num.ToString()){ },
+                        }
+                    };
+                    datarow.ExcelRows.Add(new ExcelColumn(value: item.CreateDate) { });
+                    datarow.ExcelRows.Add(new ExcelColumn(value: item.Income) { });
+                    datarow.ExcelRows.Add(new ExcelColumn(value: item.Expend) { });
+                    slist.Add(datarow);
+                }
+                #endregion
+
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+
+                return File(byteData, "application/octet-stream", ExcelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, string.Format("GetFileFromWebApi_requestData: {0}", JsonHelper.Serialize(RequestParm)));
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", ExcelName);
+            }
+
+        }
         #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/MarketingCenter/RechargeController.cs

@@ -227,6 +227,9 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             return ApiResult.Success("", pagelist);
         }
 
+
+
+
         #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/TenantController.cs

@@ -52,6 +52,16 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         private Module.User.MiniProgramPageModule programPageModule = new Module.User.MiniProgramPageModule();
 
+        /// <summary>
+        /// 海报处理类对象
+        /// </summary>
+        private Module.User.PosterModule posterModule = new Module.User.PosterModule();
+
+        /// <summary>
+        /// 用户中心配置类对象
+        /// </summary>
+        private Module.User.MiniProgramUserCenterConfigModule userCenterConfigModule = new Module.User.MiniProgramUserCenterConfigModule();
+
         #region 商户信息
         /// <summary>
         /// 用户登录
@@ -669,12 +679,93 @@ namespace Mall.WebApi.Controllers.User
         public ApiResult SetMiniprogramPageTitle()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
-
             var pageList = JsonConvert.DeserializeObject<List<RB_MiniProgram_Page_Extend>>(parms.GetStringValue("setMsg"));
             var flag = programPageModule.SetMiniProgram_PageTitle_ByListModule(pageList);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
         #endregion
 
+        #region 海报处理
+
+        /// <summary>
+        /// 添加修改分销海报
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetFenXiaoPoster()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_FenXiaoPoster_Extend>(RequestParm.msg.ToString());
+            extModel.TenantId = RequestParm.TenantId;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            var flag = posterModule.SetFenXiaoPosterModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取分销海报
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetFenXiaoPoster()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_FenXiaoPoster_Extend>(RequestParm.msg.ToString());
+            extModel.TenantId = RequestParm.TenantId;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            var result = posterModule.GetFenXiaoPosterEntityModule(extModel);
+            return ApiResult.Success(data: result);
+        }
+
+        /// <summary>
+        /// 添加修改商品海报
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetGoodPosterModule()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_GoodPoster_Extend>(RequestParm.msg.ToString());
+            extModel.TenantId = RequestParm.TenantId;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            var flag = posterModule.SetGoodPosterModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取商品海报
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetGoodPoster()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_GoodPoster_Extend>(RequestParm.msg.ToString());
+            extModel.TenantId = RequestParm.TenantId;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            var result = posterModule.GetGoodPosterEntityModule(extModel);
+            return ApiResult.Success(data: result);
+        }
+        #endregion
+
+        #region 用户中心配置
+        /// <summary>
+        /// 添加修改用户中心配置
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniUserCenterConfig()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_UserCenterConfig_Extend>(RequestParm.msg.ToString());
+            extModel.TenantId = RequestParm.TenantId;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            var flag = userCenterConfigModule.SetMiniUserCenterConfigModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取用户中心配置
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetUserCenterConfig()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_UserCenterConfig_Extend>(RequestParm.msg.ToString());
+            extModel.TenantId = RequestParm.TenantId;
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            var result = userCenterConfigModule.GetUserCenterConfigModule(extModel);
+            return ApiResult.Success(data: result);
+        }
+        #endregion
     }
 }
\ No newline at end of file