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

Mall.Model/Entity/Product/RB_Goods.cs

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

Mall.Model/Entity/Product/RB_Goods_Area.cs

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

Mall.Model/Entity/Product/RB_Goods_Category.cs

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

Mall.Model/Entity/Product/RB_Goods_DistributionCommission.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品关联分销佣金表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_DistributionCommission
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格排序组  逗号分隔每规格值
+        /// </summary>        
+        public string SpecificationSort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分销商等级   0普通等级
+        /// </summary>        
+        public int? DistributorGrade
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 一级佣金
+        /// </summary>        
+        public decimal? OneCommission
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 二级佣金
+        /// </summary>        
+        public decimal? TwoCommission
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 三级佣金
+        /// </summary>        
+        public decimal? ThreeCommission
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// Status
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_ExpressRelevance.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品订单快递关联表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_ExpressRelevance
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单id
+        /// </summary>        
+        public int? OrderId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单明细id
+        /// </summary>        
+        public int? OrderDetailId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单快递id
+        /// </summary>        
+        public int? OrderExpressId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_MemberPrice.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品关联会员价格表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_MemberPrice
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格排序组  逗号分隔每规格值
+        /// </summary>        
+        public string SpecificationSort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分销商等级   0普通等级
+        /// </summary>        
+        public int? MemberGrade
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 会员价格
+        /// </summary>        
+        public decimal? MemberPrice
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// Status
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_Order.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品订单表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Order
+    {
+
+        /// <summary>
+        /// OrderId
+        /// </summary>        
+        public int OrderId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单号
+        /// </summary>        
+        public string OrderNo
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户单号
+        /// </summary>        
+        public string MerchantsNo
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户id
+        /// </summary>        
+        public int? UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单来源（平台）  枚举
+        /// </summary>        
+        public int? OrderSource
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单类型  枚举
+        /// </summary>        
+        public int? OrderType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 支付方式   枚举
+        /// </summary>        
+        public int? PaymentWay
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 应收金额
+        /// </summary>        
+        public decimal? PreferPrice
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 实收金额
+        /// </summary>        
+        public decimal? Income
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 运费
+        /// </summary>        
+        public decimal? FreightMoney
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 配送方式
+        /// </summary>        
+        public int? DeliveryMethod
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 手续费
+        /// </summary>        
+        public decimal? Fee
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 退款
+        /// </summary>        
+        public decimal? Refund
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 优惠金额
+        /// </summary>        
+        public decimal? CouponMoney
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 优惠卷ids
+        /// </summary>        
+        public string CouponsIds
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 收件人
+        /// </summary>        
+        public string Consignee
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 手机号码
+        /// </summary>        
+        public string Mobile
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 国家
+        /// </summary>        
+        public int? Country
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 省
+        /// </summary>        
+        public int? Province
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 市
+        /// </summary>        
+        public int? City
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 区
+        /// </summary>        
+        public int? District
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 收货地址
+        /// </summary>        
+        public string ShippingAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 买家留言
+        /// </summary>        
+        public string BuyerMessage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下单备注
+        /// </summary>        
+        public string Remark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单状态  枚举
+        /// </summary>        
+        public int? OrderStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 回收   1是  2否
+        /// </summary>        
+        public int? Recycled
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品订单明细表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderDetail
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单id
+        /// </summary>        
+        public int? OrderId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单类型  枚举
+        /// </summary>        
+        public int? OrderType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品名称
+        /// </summary>        
+        public string GoodsName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 封面图
+        /// </summary>        
+        public int? CoverImage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格
+        /// </summary>        
+        public string Specification
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 货号
+        /// </summary>        
+        public string ProductCode
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单价
+        /// </summary>        
+        public decimal? Unit_Price
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 数量
+        /// </summary>        
+        public int? Number
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 原价 (=单价*数量)
+        /// </summary>        
+        public decimal? Original_Price
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 最终价格
+        /// </summary>        
+        public decimal? Final_Price
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 折扣
+        /// </summary>        
+        public decimal? DiscountRate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否商品单独会员价购买  1是  2否
+        /// </summary>        
+        public int? IsMemberPrice
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_OrderExpress.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品订单快递信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderExpress
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型  1快递   2其他方式
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 快递id
+        /// </summary>        
+        public int? ExpressId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 邮编
+        /// </summary>        
+        public string PostCode
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 快递单号
+        /// </summary>        
+        public string ExpressNumber
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 备注
+        /// </summary>        
+        public string Remark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_Specification.cs

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

Mall.Model/Entity/Product/RB_Goods_SpecificationPrice.cs

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

Mall.Model/Entity/Product/RB_Goods_SpecificationValue.cs

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

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -116,5 +116,247 @@ namespace Mall.Model.Entity.User
         /// 导航底部是否开启阴影效果(0-未开启，1-开启)
         /// </summary>
         public int BottomNavIsShadow { get; set; }
+
+        /// <summary>
+        /// 是否开启版权设置(0-开启,1-关闭)
+        /// </summary>
+        public int IsOpenCopyRight { get; set; }
+
+        /// <summary>
+        /// 小程序AppId
+        /// </summary>        
+        public string MiniAppId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序AppSecret
+        /// </summary>        
+        public string MiniAppSecret
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信支付商户号
+        /// </summary>        
+        public string WeChatPayMerchants
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信支付Api密钥
+        /// </summary>        
+        public string WeChatApiSecret
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信支付证书
+        /// </summary>        
+        public string WeChatPayCertificate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信支付私钥
+        /// </summary>        
+        public string WeChatPayPrivateKey
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 下单成功提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string OrderSuccessTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 订单取消提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string OrderCancelTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 订单发货提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string OrderDeliverGoodsTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 退款提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string RefundTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 活动状态提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string ActiveStateTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 审核结果提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string AuditResultTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 提现成功通知(类目: 服装/鞋/箱包 )
+        /// </summary>        
+        public string ReflectSuccessTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 提现失败通知(类目: 服装/鞋/箱包 )
+        /// </summary>        
+        public string ReflectFailTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 会员等级变更通知(类目: 服装/鞋/箱包 )
+        /// </summary>        
+        public string MembersLevelChangeTpl
+        {
+            get;
+            set;
+        }
+
+        #region 会员中心配置
+        /// <summary>
+        /// 会员中心默认背景
+        /// </summary>        
+        public string DefaultBgImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 会员中心普通用户背景
+        /// </summary>        
+        public string MemberBgImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 会员中心Vip背景
+        /// </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>
+        /// 是否显示订单栏(0-显示，1-不显示)
+        /// </summary>        
+        public int? IsShowOrderNav
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否显示账户栏(0-显示，1-不显示)
+        /// </summary>        
+        public int? IsShowAccountNav
+        {
+            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;
+        }
+
+        #endregion
     }
 }

Mall.Model/Entity/User/RB_MiniProgram_FenXiaoPoster.cs

@@ -72,6 +72,10 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public int NickPaddingLeft { get; set; }
 
+        /// <summary>
+        /// 昵称颜色
+        /// </summary>
+        public string NickColor { get; set; }
 
         /// <summary>
         /// 是否显示二维码(0-显示,1-不显示)
@@ -93,5 +97,10 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public int QrCodePaddingLeft { get; set; }
 
+        /// <summary>
+        /// 二维码形状(0-圆形，1-方形)
+        /// </summary>
+        public int QrCodeType { get; set; }
+
     }
 }

Mall.Model/Entity/User/RB_MiniProgram_GoodPoster.cs

@@ -27,20 +27,12 @@ namespace Mall.Model.Entity.User
         /// </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; }
+        public int PosterStyle { get; set; }
 
         /// <summary>
         /// 商品图片数量

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/Entity/User/RB_MiniProgram_UserCenterMenu.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_UserCenterMenu
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>        
+        public int DetailId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>        
+        public int? MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 页面类型(1-基础页面,2-营销页面，3-订单页面，4-插件页面，5-diy页面
+        /// </summary>        
+        public int? MenuType
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 菜单名称
+        /// </summary>        
+        public string MenuName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 菜单图标
+        /// </summary>        
+        public string MenuIcon
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 菜单链接
+        /// </summary>        
+        public string MenuUrl
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/User/RB_PlugIn.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 插件表实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_PlugIn
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>        
+        public int PlugId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 插件类型(1-基础组件，2-营销组件，3-其他组件)
+        /// </summary>        
+        public int PlugType
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 插件Key
+        /// </summary>        
+        public string Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 插件名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 图标
+        /// </summary>        
+        public string Icon
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Area.cs

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

Mall.Model/Extend/Product/RB_Goods_Area_Extend.cs

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

Mall.Model/Extend/Product/RB_Goods_Category_Extend.cs

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

Mall.Model/Extend/Product/RB_Goods_DistributionCommission_Extend.cs

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

Mall.Model/Extend/Product/RB_Goods_Extend.cs

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

Mall.Model/Extend/Product/RB_Goods_MemberPrice_Extend.cs

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

Mall.Model/Extend/Product/RB_Goods_SpecificationPrice_Extend.cs

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

Mall.Model/Extend/Product/RB_Goods_SpecificationValue_Extend.cs

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

Mall.Model/Extend/Product/RB_Goods_Specification_Extend.cs

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

Mall.Model/Extend/Product/RB_Product_Service_Extend.cs

@@ -17,5 +17,9 @@ namespace Mall.Model.Extend.Product
         /// 更新类型
         /// </summary>
         public int? UpdateType { get; set; }
+        /// <summary>
+        /// ids
+        /// </summary>
+        public string ServiceIds { get; set; }
     }
 }

Mall.Model/Extend/User/RB_MiniProgram_Extend.cs

@@ -65,5 +65,25 @@ namespace Mall.Model.Extend.User
         /// 底部导航列表
         /// </summary>
         public List<RB_Miniprogram_Bottomnav_Extend> BottomTagList { get; set; }
+
+        /// <summary>
+        /// 小程序用户中心【收藏、足迹】菜单列表
+        /// </summary>
+        public List<RB_MiniProgram_UserCenterMenu_Extend> FavoriteFootMenuList { get; set; }
+
+        /// <summary>
+        /// 小程序用户中心【订单】菜单列表
+        /// </summary>
+        public List<RB_MiniProgram_UserCenterMenu_Extend> OrderMenuList { get; set; }
+
+        /// <summary>
+        /// 小程序用户中心【账户】菜单列表
+        /// </summary>
+        public List<RB_MiniProgram_UserCenterMenu_Extend> AccountMenuList { get; set; }
+
+        /// <summary>
+        /// 小程序用户中心【自定义】菜单列表
+        /// </summary>
+        public List<RB_MiniProgram_UserCenterMenu_Extend> SelfMenuList { get; set; }
     }
 }

Mall.Model/Extend/User/RB_MiniProgram_UserCenterConfig_Extend.cs → Mall.Model/Extend/User/RB_MiniProgram_UserCenterMenu_Extend.cs

@@ -6,11 +6,11 @@ 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
+    public class RB_MiniProgram_UserCenterMenu_Extend : Model.Entity.User.RB_MiniProgram_UserCenterMenu
     {
 
     }

Mall.Model/Extend/User/RB_PlugIn_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_PlugIn_Extend : Model.Entity.User.RB_PlugIn
+    {
+        /// <summary>
+        /// 组件分类名称
+        /// </summary>
+        public string GroupName
+        {
+            get
+            {
+                string str = "";
+                switch (this.PlugType)
+                {
+                    case 1: str = "基础组件";break;
+                    case 2: str = "营销组件"; break;
+                    case 3: str = "其他组件"; break;
+                }
+                return   str;
+            }
+        }
+    }
+}

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

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Extend.User;
+using Mall.Repository;
+
+namespace Mall.Module.User
+{
+    /// <summary>
+    /// 插件处理类
+    /// </summary>
+    public class PlugInModule
+    {
+        /// <summary>
+        /// 插件仓储层对象
+        /// </summary>
+        private readonly Repository.User.RB_PlugInRepository plugInRepository = new Repository.User.RB_PlugInRepository();
+
+        /// <summary>
+        /// 根据查询条件获取插件列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_PlugIn_Extend> GetPlugInListModule(RB_PlugIn_Extend query)
+        {
+            return plugInRepository.GetListRepository(query);
+        }
+    }
+}

Mall.Module.User/PosterModule.cs

@@ -55,10 +55,12 @@ namespace Mall.Module.User
                     { 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.NickColor),extModel.NickColor},
                     { 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},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.QrCodeType),extModel.QrCodeType},
                 };
                 flag = fenXiaoPosterRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_FenXiaoPoster_Extend.Id), extModel.Id));
             }
@@ -93,9 +95,7 @@ namespace Mall.Module.User
             {
                 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.PosterStyle),extModel.PosterStyle},
                     { nameof(RB_MiniProgram_GoodPoster_Extend.GoodsImgCount),extModel.GoodsImgCount},
                 };
                 flag = goodPosterRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_GoodPoster_Extend.Id), extModel.Id));

Mall.Module.User/UserModule.cs

@@ -448,7 +448,7 @@ namespace Mall.Module.User
         public bool SetMemberIntegralInfo(RB_Member_Integral_Extend demodel)
         {
             var umodel = member_UserRepository.GetEntity(demodel.UserId);
-            int Integral = 0;
+            int Integral;
             if ((int)demodel.Type == 1)
             {
                 Integral = (umodel.Integral ?? 0) + (demodel.Integral ?? 0);

Mall.Repository/Product/RB_GoodsRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品仓储层
+    /// </summary>
+    public class RB_GoodsRepository : RepositoryBase<RB_Goods>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Goods_Extend dmodel)
+        {
+            string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and g.{nameof(RB_Goods_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and g.{nameof(RB_Goods_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and g.{nameof(RB_Goods_Extend.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and g.{nameof(RB_Goods_Extend.Id)} in({dmodel.GoodsIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name)) {
+                where += $@" and g.{nameof(RB_Goods_Extend.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.GoodsStatus > 0) {
+                where += $@" and g.{nameof(RB_Goods_Extend.GoodsStatus)}={dmodel.GoodsStatus}";
+            }
+            if (dmodel.IsSelectSellOut == 1) {
+                where += $@" and g.{nameof(RB_Goods_Extend.InventoryNum)}<=0";
+            }
+            if (!string.IsNullOrEmpty(dmodel.CategoryIds)) {
+                where += $@" and c.{nameof(RB_Goods_Category.CategoryId)} in({dmodel.CategoryIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime)) {
+                where += $@" and g.{nameof(RB_Goods_Extend.CreateDate)} >='{dmodel.StartTime}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime)) {
+                where += $@" and g.{nameof(RB_Goods_Extend.CreateDate)} <='{dmodel.EndTime + " 23:59:59"}'";
+            }
+            
+            string sql = $@"select g.* from RB_Goods g
+inner join rb_goods_category c on g.Id=c.GoodsId 
+where {where} group by g.Id order by g.CreateDate desc";
+            return GetPage<RB_Goods_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_Extend> GetList(RB_Goods_Extend dmodel)
+        {
+            string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds))
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.Id)} in({dmodel.GoodsIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.GoodsStatus > 0)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.GoodsStatus)}={dmodel.GoodsStatus}";
+            }
+            if (dmodel.IsSelectSellOut == 1)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.InventoryNum)}<=0";
+            }
+            if (!string.IsNullOrEmpty(dmodel.CategoryIds))
+            {
+                where += $@" and c.{nameof(RB_Goods_Category.CategoryId)} in({dmodel.CategoryIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.CreateDate)} >='{dmodel.StartTime}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.CreateDate)} <='{dmodel.EndTime + " 23:59:59"}'";
+            }
+
+            string sql = $@"select g.* from RB_Goods g
+inner join rb_goods_category c on g.Id=c.GoodsId 
+where {where} group by g.Id order by g.CreateDate desc";
+            return Get<RB_Goods_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Goods_AreaRepository.cs

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

Mall.Repository/Product/RB_Goods_CategoryRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品关联分类仓储层
+    /// </summary>
+    public class RB_Goods_CategoryRepository : RepositoryBase<RB_Goods_Category>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_Category_Extend> GetList(RB_Goods_Category_Extend dmodel)
+        {
+            string where = $" 1=1 and gc.{nameof(RB_Goods_Category.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and gc.{nameof(RB_Goods_Category.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and gc.{nameof(RB_Goods_Category.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and gc.{nameof(RB_Goods_Category.Id)}={dmodel.Id}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and gc.{nameof(RB_Goods_Category.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and gc.{nameof(RB_Goods_Category.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            
+            string sql = $@"select gc.*,pc.Name as CategoryName from RB_Goods_Category gc
+inner join rb_product_category pc on gc.CategoryId=pc.Id
+where {where} order by gc.Id desc";
+            return Get<RB_Goods_Category_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Goods_DistributionCommissionRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品关联分销佣金仓储层
+    /// </summary>
+    public class RB_Goods_DistributionCommissionRepository : RepositoryBase<RB_Goods_DistributionCommission>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_DistributionCommission_Extend> GetList(RB_Goods_DistributionCommission_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Goods_DistributionCommission.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Goods_DistributionCommission.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationPrice.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Goods_DistributionCommission.Id)}={dmodel.Id}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and {nameof(RB_Goods_DistributionCommission.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and {nameof(RB_Goods_DistributionCommission.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            
+            string sql = $@"select * from RB_Goods_DistributionCommission where {where} order by Id desc";
+            return Get<RB_Goods_DistributionCommission_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Goods_MemberPriceRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品关联会员价格仓储层
+    /// </summary>
+    public class RB_Goods_MemberPriceRepository : RepositoryBase<RB_Goods_MemberPrice>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_MemberPrice_Extend> GetList(RB_Goods_MemberPrice_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Goods_MemberPrice.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Goods_MemberPrice.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Goods_MemberPrice.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Goods_MemberPrice.Id)}={dmodel.Id}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and {nameof(RB_Goods_MemberPrice.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and {nameof(RB_Goods_MemberPrice.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            
+            string sql = $@"select * from RB_Goods_MemberPrice where {where} order by Id desc";
+            return Get<RB_Goods_MemberPrice_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Goods_SpecificationPriceRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品关联规格价格仓储层
+    /// </summary>
+    public class RB_Goods_SpecificationPriceRepository : RepositoryBase<RB_Goods_SpecificationPrice>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_SpecificationPrice_Extend> GetList(RB_Goods_SpecificationPrice_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Goods_SpecificationPrice.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationPrice.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationPrice.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationPrice.Id)}={dmodel.Id}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationPrice.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and {nameof(RB_Goods_SpecificationPrice.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            
+            string sql = $@"select * from RB_Goods_SpecificationPrice where {where} order by Id desc";
+            return Get<RB_Goods_SpecificationPrice_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Goods_SpecificationRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品关联规格仓储层
+    /// </summary>
+    public class RB_Goods_SpecificationRepository : RepositoryBase<RB_Goods_Specification>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_Specification_Extend> GetList(RB_Goods_Specification_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Goods_Specification.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Goods_Specification.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Goods_Specification.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Goods_Specification.Id)}={dmodel.Id}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and {nameof(RB_Goods_Specification.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and {nameof(RB_Goods_Specification.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            
+            string sql = $@"select * from RB_Goods_Specification where {where} order by Id desc";
+            return Get<RB_Goods_Specification_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Goods_SpecificationValueRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品关联规格值仓储层
+    /// </summary>
+    public class RB_Goods_SpecificationValueRepository : RepositoryBase<RB_Goods_SpecificationValue>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_SpecificationValue_Extend> GetList(RB_Goods_SpecificationValue_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Goods_SpecificationValue.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationValue.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationValue.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationValue.Id)}={dmodel.Id}";
+            }
+            if (dmodel.SpecificationId > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationValue.SpecificationId)}={dmodel.SpecificationId}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and {nameof(RB_Goods_SpecificationValue.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and {nameof(RB_Goods_SpecificationValue.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            
+            string sql = $@"select * from RB_Goods_SpecificationValue where {where} order by Id desc";
+            return Get<RB_Goods_SpecificationValue_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Product_ServiceRepository.cs

@@ -64,6 +64,9 @@ namespace Mall.Repository.Product
             {
                 where += $@" and {nameof(RB_Product_Service.Id)}={dmodel.Id}";
             }
+            if (!string.IsNullOrEmpty(dmodel.ServiceIds)) {
+                where += $@" and {nameof(RB_Product_Service.Id)} in({dmodel.ServiceIds})";
+            }
             if (!string.IsNullOrEmpty(dmodel.Name))
             {
                 where += $@" and {nameof(RB_Product_Service.Name)} like '%{dmodel.Name}%'";

Mall.Repository/User/RB_MiniProgram_UserCenterConfigRepository.cs → Mall.Repository/User/RB_MiniProgram_UserCenterMenuRepository.cs

@@ -10,33 +10,25 @@ namespace Mall.Repository.User
     /// <summary>
     /// 小程序用户中心配置仓储层
     /// </summary>
-    public class RB_MiniProgram_UserCenterConfigRepository : RepositoryBase<RB_MiniProgram_UserCenterConfig>
+    public class RB_MiniProgram_UserCenterMenuRepository : RepositoryBase<RB_MiniProgram_UserCenterMenu>
     {
         /// <summary>
-        /// 根据查询条件获取小程序用户中心配置实体
+        /// 根据查询条件获取小程序用户中心菜单列表
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public RB_MiniProgram_UserCenterConfig_Extend GetEntityExtRepository(RB_MiniProgram_UserCenterConfig_Extend query)
+        public List<RB_MiniProgram_UserCenterMenu_Extend> GetListExtRepository(RB_MiniProgram_UserCenterMenu_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append(" SELECT * FROM RB_MiniProgram_UserCenterConfig WHERE 1=1 ");
+            builder.Append(" SELECT * FROM RB_MiniProgram_UserCenterMenu 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();
+            return Get<RB_MiniProgram_UserCenterMenu_Extend>(builder.ToString()).ToList();
         }
     }
 }

Mall.Repository/User/RB_PlugInRepository.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_PlugInRepository:RepositoryBase<RB_PlugIn>
+    {
+        /// <summary>
+        /// 根据查询条件获取插件列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_PlugIn_Extend> GetListRepository(RB_PlugIn_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_PlugIn WHERE 1=1 AND Status=0 ");
+            if (query != null)
+            {
+                
+            }
+            return Get<RB_PlugIn_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/User/TenantController.cs

@@ -58,9 +58,11 @@ namespace Mall.WebApi.Controllers.User
         private Module.User.PosterModule posterModule = new Module.User.PosterModule();
 
         /// <summary>
-        /// 用户中心配置类对象
+        /// 插件处理类
         /// </summary>
-        private Module.User.MiniProgramUserCenterConfigModule userCenterConfigModule = new Module.User.MiniProgramUserCenterConfigModule();
+        private Module.User.PlugInModule plugInModule = new Module.User.PlugInModule();
+
+ 
 
         #region 商户信息
         /// <summary>
@@ -307,6 +309,45 @@ namespace Mall.WebApi.Controllers.User
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 修改微信小程序配置信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgramAppConfig()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            var flag = programModule.SetMiniProgramAppConfigModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 修改微信小程序商城订阅配置信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgramMallSubscribe()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            var flag = programModule.SetMiniProgramMallSubscribeModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 修改微信小程序分销订阅配置信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgramMallDistribution()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            var flag = programModule.SetMiniProgramMallDistributionModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 删除底部导航
         /// </summary>
@@ -339,7 +380,10 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult SetMiniProgrameCopyRight()
         {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
+            int IsOpenCopyRight = parms.GetInt("IsOpenCopyRight", -1);
+            extModel.IsOpenCopyRight = IsOpenCopyRight;
             var flag = programModule.SetMiniProgramCopyRightModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
@@ -747,10 +791,10 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult SetMiniUserCenterConfig()
         {
-            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_UserCenterConfig_Extend>(RequestParm.msg.ToString());
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
             extModel.TenantId = RequestParm.TenantId;
             extModel.MallBaseId = RequestParm.MallBaseId;
-            var flag = userCenterConfigModule.SetMiniUserCenterConfigModule(extModel);
+            var flag = programModule.SetMiniUserCenterConfigModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
@@ -760,12 +804,47 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult GetUserCenterConfig()
         {
-            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_UserCenterConfig_Extend>(RequestParm.msg.ToString());
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
             extModel.TenantId = RequestParm.TenantId;
             extModel.MallBaseId = RequestParm.MallBaseId;
-            var result = userCenterConfigModule.GetUserCenterConfigModule(extModel);
+            var result = programModule.GetMiniProgramModule(extModel,isGetUserCenterMenu:true);
             return ApiResult.Success(data: result);
         }
+
+        /// <summary>
+        /// 删除用户中心自定义菜单
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveMiniUserCenterMenu()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var DetailId = parms.GetInt("DetailId", 0);
+            var flag = programModule.RemoveMiniUserCenterMenuModule(DetailId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
         #endregion
+
+        /// <summary>
+        /// 获取插件列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetPlugInList()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_PlugIn_Extend>(RequestParm.msg.ToString());
+   
+            var list = plugInModule.GetPlugInListModule(extModel);
+            var distinctList = list.GroupBy(qitem => new { qitem.PlugType ,qitem.GroupName}).Select(qitem => new { qitem.Key.PlugType,qitem.Key.GroupName});
+            List<object> resultList = new List<object>();
+            foreach (var item in distinctList)
+            {
+                var obj = new
+                {
+                    item.GroupName,
+                    SubList = list.Where(qitem => qitem.PlugType == item.PlugType).Select(qitem => new { qitem.Id, qitem.Name, qitem.Icon })
+                };
+                resultList.Add(obj);
+            }
+            return ApiResult.Success(data: resultList);
+        }
     }
 }
\ No newline at end of file