经销商注册逻辑

liaoxujun@qq.com

2024-03-05 f0ca9fb79a91544c037c55a291be00e8c469bf34

经销商注册逻辑

 .gitignore

@@ -51,3 +51,5 @@
CoreCms.Net.Web.WebApi/wwwroot/static/qrCode/weChat/
CoreCms.Net.Web.WebApi/wwwroot/upload/20240229/20240229100418_6365.jpg
CoreCms.Net.Web.WebApi/wwwroot/upload/
WXCertUtil.exe
WXCertUtil/

 CoreCms.Net.Configuration/GlobalConstVars.cs

@@ -193,10 +193,10 @@
        public const string CacheCoreCmsCart = "CacheCoreCmsCart"; // 购物车表
        public const string CacheCoreCmsClerk = "CacheCoreCmsClerk"; //店铺店员关联表
        public const string CacheCoreCmsCoupon = "CacheCoreCmsCoupon"; // 优惠券表
        public const string CacheCoreCmsDistribution = "CacheCoreCmsDistribution"; // 分销商表
        public const string CacheCoreCmsDistributionCondition = "CacheCoreCmsDistributionCondition"; //分销商等级升级条件
        public const string CacheCoreCmsDistributionGrade = "CacheCoreCmsDistributionGrade"; // 分销商等级设置表
        public const string CacheCoreCmsDistributionOrder = "CacheCoreCmsDistributionOrder"; //分销商订单记录表
        public const string CacheCoreCmsDistribution = "CacheCoreCmsDistribution"; // 经销商表
        public const string CacheCoreCmsDistributionCondition = "CacheCoreCmsDistributionCondition"; //经销商等级升级条件
        public const string CacheCoreCmsDistributionGrade = "CacheCoreCmsDistributionGrade"; // 经销商等级设置表
        public const string CacheCoreCmsDistributionOrder = "CacheCoreCmsDistributionOrder"; //经销商订单记录表
        public const string CacheCoreCmsDistributionResult = "CacheCoreCmsDistributionResult"; // 等级佣金表
        public const string CacheCoreCmsErrorMessageLog = "CacheCoreCmsErrorMessageLog"; //后台异常错误表
        public const string CacheCoreCmsForm = "CacheCoreCmsForm"; //表单
@@ -364,7 +364,7 @@


        /// <summary>
        /// 订单完结后走代理或分销商提成处理
        /// 订单完结后走代理或经销商提成处理
        /// </summary>
        public const string OrderAgentOrDistribution = "OrderAgentOrDistributionQueue";
        /// <summary>

 CoreCms.Net.Configuration/GlobalEnumVars.cs

@@ -2294,7 +2294,7 @@

        #region 分销设置
        /// <summary>
        /// 分销商申请审核状态
        /// 经销商申请审核状态
        /// </summary>
        public enum DistributionVerifyStatus
        {
@@ -2315,7 +2315,7 @@
            VerifyRefuse = 3,
        }
        /// <summary>
        /// 分销商订单记录表是否结算状态
        /// 经销商订单记录表是否结算状态
        /// </summary>

        public enum DistributionOrderSettlementStatus
@@ -2431,7 +2431,7 @@
        }

        /// <summary>
        /// 成为分销商条件
        /// 成为经销商条件
        /// </summary>
        public enum DistributionConditionType
        {

 CoreCms.Net.Configuration/SystemSettingConstVars.cs

@@ -123,7 +123,7 @@
        /// </summary>
        public const string OpenDistribution = "openDistribution";
        /// <summary>
        /// 用户须知：成为分销商后，可以获取佣金，用户只可被推荐一次，越早推荐越返利越多哦。
        /// 用户须知：成为经销商后，可以获取佣金，用户只可被推荐一次，越早推荐越返利越多哦。
        /// </summary>
        public const string DistributionNotes = "distributionNotes";
        /// <summary>
@@ -151,19 +151,19 @@
        /// </summary>
        public const string DistributionLevel = "distributionLevel";
        /// <summary>
        /// 成为分销商条件：1无条件(需要审核),2申请(需要审核),3无条件,4注册账号自动开通
        /// 成为经销商条件：1无条件(需要审核),2申请(需要审核),3无条件,4注册账号自动开通
        /// </summary>
        public const string DistributionType = "distributionType";
        /// <summary>
        /// 消费自动成为分销商：元
        /// 消费自动成为经销商：元
        /// </summary>
        public const string DistributionMoney = "distributionMoney";
        /// <summary>
        /// 购买商品成为分销商：1关闭，2任意商品，3指定商品
        /// 购买商品成为经销商：1关闭，2任意商品，3指定商品
        /// </summary>
        public const string DistributionGoods = "distributionGoods";
        /// <summary>
        /// 购买商品成为分销商指定商品序列号
        /// 购买商品成为经销商指定商品序列号
        /// </summary>
        public const string DistributionGoodsId = "distributionGoodsId";
        /// <summary>

 CoreCms.Net.Configuration/SystemSettingDictionary.cs

@@ -115,10 +115,10 @@


            di.Add(SystemSettingConstVars.DistributionLevel, new DictionaryKeyValues() { sKey = "分销层级", sValue = "2" });
            di.Add(SystemSettingConstVars.DistributionType, new DictionaryKeyValues() { sKey = "成为分销商条件", sValue = "1" });
            di.Add(SystemSettingConstVars.DistributionMoney, new DictionaryKeyValues() { sKey = "消费自动成为分销商", sValue = "100" });
            di.Add(SystemSettingConstVars.DistributionGoods, new DictionaryKeyValues() { sKey = "购买商品成为分销商", sValue = "1" });
            di.Add(SystemSettingConstVars.DistributionGoodsId, new DictionaryKeyValues() { sKey = "购买商品成为分销商指定商品序列号", sValue = "0" });
            di.Add(SystemSettingConstVars.DistributionType, new DictionaryKeyValues() { sKey = "成为经销商条件", sValue = "1" });
            di.Add(SystemSettingConstVars.DistributionMoney, new DictionaryKeyValues() { sKey = "消费自动成为经销商", sValue = "100" });
            di.Add(SystemSettingConstVars.DistributionGoods, new DictionaryKeyValues() { sKey = "购买商品成为经销商", sValue = "1" });
            di.Add(SystemSettingConstVars.DistributionGoodsId, new DictionaryKeyValues() { sKey = "购买商品成为经销商指定商品序列号", sValue = "0" });

            //邀请好友
            di.Add(SystemSettingConstVars.CommissionType, new DictionaryKeyValues() { sKey = "佣金类型", sValue = "1" });

 CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionConditionRepository.cs

@@ -20,7 +20,7 @@
namespace CoreCms.Net.IRepository
{
    /// <summary>
    ///     分销商等级升级条件 工厂接口
    ///     经销商等级升级条件 工厂接口
    /// </summary>
    public interface ICoreCmsDistributionConditionRepository : IBaseRepository<CoreCmsDistributionCondition>
    {

 CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionGradeRepository.cs

@@ -11,7 +11,7 @@
namespace CoreCms.Net.IRepository
{
    /// <summary>
    /// 分销商等级设置表 工厂接口
    /// 经销商等级设置表 工厂接口
    /// </summary>
    public interface ICoreCmsDistributionGradeRepository : IBaseRepository<CoreCmsDistributionGrade>
    {

 CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionOrderRepository.cs

@@ -11,7 +11,7 @@
namespace CoreCms.Net.IRepository
{
    /// <summary>
    /// 分销商订单记录表 工厂接口
    /// 经销商订单记录表 工厂接口
    /// </summary>
    public interface ICoreCmsDistributionOrderRepository : IBaseRepository<CoreCmsDistributionOrder>
    {

 CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionRepository.cs

@@ -11,7 +11,7 @@
namespace CoreCms.Net.IRepository
{
    /// <summary>
    /// 分销商表 工厂接口
    /// 经销商表 工厂接口
    /// </summary>
    public interface ICoreCmsDistributionRepository : IBaseRepository<CoreCmsDistribution>
    {

 CoreCms.Net.IServices/Distribution/ICoreCmsDistributionConditionServices.cs

@@ -20,7 +20,7 @@
namespace CoreCms.Net.IServices
{
    /// <summary>
    ///     分销商等级升级条件 服务工厂接口
    ///     经销商等级升级条件 服务工厂接口
    /// </summary>
    public interface ICoreCmsDistributionConditionServices : IBaseServices<CoreCmsDistributionCondition>
    {

 CoreCms.Net.IServices/Distribution/ICoreCmsDistributionGradeServices.cs

@@ -20,7 +20,7 @@
namespace CoreCms.Net.IServices
{
    /// <summary>
    ///     分销商等级设置表 服务工厂接口
    ///     经销商等级设置表 服务工厂接口
    /// </summary>
    public interface ICoreCmsDistributionGradeServices : IBaseServices<CoreCmsDistributionGrade>
    {

 CoreCms.Net.IServices/Distribution/ICoreCmsDistributionOrderServices.cs

@@ -20,7 +20,7 @@
namespace CoreCms.Net.IServices
{
    /// <summary>
    ///     分销商订单记录表 服务工厂接口
    ///     经销商订单记录表 服务工厂接口
    /// </summary>
    public interface ICoreCmsDistributionOrderServices : IBaseServices<CoreCmsDistributionOrder>
    {

 CoreCms.Net.IServices/Distribution/ICoreCmsDistributionServices.cs

@@ -21,12 +21,12 @@
namespace CoreCms.Net.IServices
{
    /// <summary>
    ///     分销商表 服务工厂接口
    ///     经销商表 服务工厂接口
    /// </summary>
    public interface ICoreCmsDistributionServices : IBaseServices<CoreCmsDistribution>
    {
        /// <summary>
        ///     获取分销商信息
        ///     获取经销商信息
        /// </summary>
        /// <param name="userId">用户id</param>
        /// <param name="checkStatus">是否检查满足条件</param>
@@ -69,7 +69,7 @@
        Task<WebApiCallBack> GetGradeAndCommission(int userId);


        //检查是否可以成为分销商
        //检查是否可以成为经销商
        Task CheckCondition(Dictionary<string, DictionaryKeyValues> allConfigs, CoreCmsDistribution info,
            int userId = 0);


 CoreCms.Net.Model/CoreCms.Net.Model.xml

@@ -405,7 +405,7 @@
            代理商订单记录表
            </summary>
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.#ctor">
@@ -470,7 +470,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.distributorName">
            <summary>
            分销商
            经销商
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.goodsAmount">
@@ -1924,15 +1924,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistribution">
            <summary>
            分销商表
            经销商表
            </summary>
            <summary>
                分销商表
                经销商表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistribution.#ctor">
            <summary>
            分销商表
            经销商表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.id">
@@ -1947,7 +1947,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.gradeId">
@@ -2013,6 +2013,26 @@
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.isDelete">
            <summary>
            是否删除
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.areaCode">
            <summary>
            店铺区域
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.address">
            <summary>
            地址详情
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.sales">
            <summary>
            年销售额
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.profession">
            <summary>
            所属行业
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.TotalSettlementAmount">
@@ -2092,15 +2112,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition">
            <summary>
            分销商等级升级条件
            经销商等级升级条件
            </summary>
            <summary>
                分销商等级升级条件
                经销商等级升级条件
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.#ctor">
            <summary>
            分销商等级升级条件
            经销商等级升级条件
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.id">
@@ -2130,12 +2150,12 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade">
            <summary>
            分销商等级设置表
            经销商等级设置表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.#ctor">
            <summary>
            分销商等级设置表
            经销商等级设置表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.id">
@@ -2170,15 +2190,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder">
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
            <summary>
                分销商订单记录表
                经销商订单记录表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.#ctor">
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.id">
@@ -2188,7 +2208,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.userId">
            <summary>
            用户分销商id
            用户经销商id
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.buyUserId">
@@ -2243,7 +2263,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.distributorName">
            <summary>
                分销商
                经销商
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.goodsAmount">
@@ -9068,7 +9088,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.gradeId">
@@ -9253,7 +9273,47 @@
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMDistributionApply">
            <summary>
                申请成为分销商接口提交参数
                申请成为经销商接口提交参数
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.mobile">
            <summary>
            电话
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.name">
            <summary>
            联系人
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeName">
            <summary>
            店铺名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.areaCode">
            <summary>
            地址分类
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.address">
            <summary>
            详细地址
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeBanner">
            <summary>
            店铺门头
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.sales">
            <summary>
            销售额度
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.profession">
            <summary>
            所属行业
            </summary>
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMSetDistributionStorePost">
@@ -9263,7 +9323,7 @@
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost">
            <summary>
            后台创建分销商提交参数
            后台创建经销商提交参数
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.registeredUserMobile">
@@ -9278,7 +9338,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.gradeId">
@@ -11203,12 +11263,12 @@
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.id">
            <summary>
                分销商序列
                经销商序列
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.nickname">
            <summary>
                分销商昵称
                经销商昵称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.createtime">

 CoreCms.Net.Model/Entities/Agent/CoreCmsAgentOrderPartial.cs

@@ -16,7 +16,7 @@
namespace CoreCms.Net.Model.Entities
{
    /// <summary>
    /// 分销商订单记录表
    /// 经销商订单记录表
    /// </summary>
    public partial class CoreCmsAgentOrder
    {
@@ -36,9 +36,9 @@
        public System.String buyUserAvatar { get; set; }

        /// <summary>
        /// 分销商
        /// 经销商
        /// </summary>
        [Display(Name = "分销商")]
        [Display(Name = "经销商")]
        [SugarColumn(IsIgnore = true)]
        public System.String distributorName { get; set; }


 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs

@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
    /// <summary>
    /// 分销商表
    /// 经销商表
    /// </summary>
    [SugarTable("CoreCmsDistribution",TableDescription = "分销商表")]
    [SugarTable("CoreCmsDistribution",TableDescription = "经销商表")]
    public partial class CoreCmsDistribution
    {
        /// <summary>
        /// 分销商表
        /// 经销商表
        /// </summary>
        public CoreCmsDistribution()
        {
@@ -40,10 +40,10 @@
        [Required(ErrorMessage = "请输入{0}")]
        public System.Int32 userId { get; set; }
        /// <summary>
        /// 分销商名称
        /// 经销商名称
        /// </summary>
        [Display(Name = "分销商名称")]
        [SugarColumn(ColumnDescription = "分销商名称", IsNullable = true)]
        [Display(Name = "经销商名称")]
        [SugarColumn(ColumnDescription = "经销商名称", IsNullable = true)]
        [StringLength(255, ErrorMessage = "【{0}】不能超过{1}字符长度")]
        public System.String name { get; set; }
        /// <summary>
@@ -64,14 +64,14 @@
        /// 微信号
        /// </summary>
        [Display(Name = "微信号")]
        [SugarColumn(ColumnDescription = "微信号", IsNullable = true)]
        [SugarColumn(ColumnDescription = "微信号", IsNullable = false)]
        [StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")]
        public System.String weixin { get; set; }
        /// <summary>
        /// qq号
        /// </summary>
        [Display(Name = "qq号")]
        [SugarColumn(ColumnDescription = "qq号", IsNullable = true)]
        [SugarColumn(ColumnDescription = "qq号", IsNullable = false)]
        [StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")]
        public System.String qq { get; set; }
        /// <summary>
@@ -85,21 +85,21 @@
        /// 店铺Logo
        /// </summary>
        [Display(Name = "店铺Logo")]
        [SugarColumn(ColumnDescription = "店铺Logo", IsNullable = true)]
        [SugarColumn(ColumnDescription = "店铺Logo", IsNullable = false)]
        [StringLength(255, ErrorMessage = "【{0}】不能超过{1}字符长度")]
        public System.String storeLogo { get; set; }
        /// <summary>
        /// 店铺Banner
        /// </summary>
        [Display(Name = "店铺Banner")]
        [SugarColumn(ColumnDescription = "店铺Banner", IsNullable = true)]
        [SugarColumn(ColumnDescription = "店铺Banner", IsNullable = false)]
        [StringLength(255, ErrorMessage = "【{0}】不能超过{1}字符长度")]
        public System.String storeBanner { get; set; }
        /// <summary>
        /// 店铺简介
        /// </summary>
        [Display(Name = "店铺简介")]
        [SugarColumn(ColumnDescription = "店铺简介", IsNullable = true)]
        [SugarColumn(ColumnDescription = "店铺简介", IsNullable = false)]
        [StringLength(255, ErrorMessage = "【{0}】不能超过{1}字符长度")]
        public System.String storeDesc { get; set; }
        /// <summary>
@@ -135,5 +135,35 @@
        [SugarColumn(ColumnDescription = "是否删除")]
        [Required(ErrorMessage = "请输入{0}")]
        public System.Boolean isDelete { get; set; }
        /********************************************* 增加字段 ************************************/
        /// <summary>
        /// 店铺区域
        /// </summary>
        [Display(Name = "店铺区域")]
        [SugarColumn(ColumnDescription = "店铺区域" , IsNullable = true)]   
        public string areaCode { get; set; }

        /// <summary>
        /// 地址详情
        /// </summary>
        [Display(Name = "地址详情")]
        [SugarColumn(ColumnDescription = "地址详情")]
        public string address { get; set; }

        /// <summary>
        /// 年销售额
        /// </summary>
        [Display(Name = "年销售额")]
        [SugarColumn(ColumnDescription = "年销售额")]
        public decimal sales { get; set; } = 0;


        /// <summary>
        /// 所属行业
        /// </summary>
        [Display(Name = "所属行业")]
        [SugarColumn(ColumnDescription = "所属行业")]
        public string profession { get; set; } 

    }
}

 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionCondition.cs

@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
    /// <summary>
    /// 分销商等级升级条件
    /// 经销商等级升级条件
    /// </summary>
    [SugarTable("CoreCmsDistributionCondition",TableDescription = "分销商等级升级条件")]
    [SugarTable("CoreCmsDistributionCondition",TableDescription = "经销商等级升级条件")]
    public partial class CoreCmsDistributionCondition
    {
        /// <summary>
        /// 分销商等级升级条件
        /// 经销商等级升级条件
        /// </summary>
        public CoreCmsDistributionCondition()
        {

 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionConditionPartial.cs

@@ -14,7 +14,7 @@
namespace CoreCms.Net.Model.Entities
{
    /// <summary>
    ///     分销商等级升级条件
    ///     经销商等级升级条件
    /// </summary>
    public partial class CoreCmsDistributionCondition
    {

 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionGrade.cs

@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
    /// <summary>
    /// 分销商等级设置表
    /// 经销商等级设置表
    /// </summary>
    [SugarTable("CoreCmsDistributionGrade",TableDescription = "分销商等级设置表")]
    [SugarTable("CoreCmsDistributionGrade",TableDescription = "经销商等级设置表")]
    public partial class CoreCmsDistributionGrade
    {
        /// <summary>
        /// 分销商等级设置表
        /// 经销商等级设置表
        /// </summary>
        public CoreCmsDistributionGrade()
        {

 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrder.cs

@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
    /// <summary>
    /// 分销商订单记录表
    /// 经销商订单记录表
    /// </summary>
    [SugarTable("CoreCmsDistributionOrder",TableDescription = "分销商订单记录表")]
    [SugarTable("CoreCmsDistributionOrder",TableDescription = "经销商订单记录表")]
    public partial class CoreCmsDistributionOrder
    {
        /// <summary>
        /// 分销商订单记录表
        /// 经销商订单记录表
        /// </summary>
        public CoreCmsDistributionOrder()
        {
@@ -33,10 +33,10 @@
        [Required(ErrorMessage = "请输入{0}")]
        public System.Int32 id { get; set; }
        /// <summary>
        /// 用户分销商id
        /// 用户经销商id
        /// </summary>
        [Display(Name = "用户分销商id")]
        [SugarColumn(ColumnDescription = "用户分销商id")]
        [Display(Name = "用户经销商id")]
        [SugarColumn(ColumnDescription = "用户经销商id")]
        [Required(ErrorMessage = "请输入{0}")]
        public System.Int32 userId { get; set; }
        /// <summary>

 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs

@@ -15,7 +15,7 @@
namespace CoreCms.Net.Model.Entities
{
    /// <summary>
    ///     分销商订单记录表
    ///     经销商订单记录表
    /// </summary>
    public partial class CoreCmsDistributionOrder
    {
@@ -36,9 +36,9 @@


        /// <summary>
        ///     分销商
        ///     经销商
        /// </summary>
        [Display(Name = "分销商")]
        [Display(Name = "经销商")]
        [SugarColumn(IsIgnore = true)]
        public string distributorName { get; set; }


 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs

@@ -14,7 +14,7 @@
namespace CoreCms.Net.Model.Entities
{
    /// <summary>
    ///     分销商表
    ///     经销商表
    /// </summary>
    public partial class CoreCmsDistribution
    {

 CoreCms.Net.Model/FromBody/FMAgent.cs

@@ -74,7 +74,7 @@
        public System.Int32 userId { get; set; }

        /// <summary>
        /// 分销商名称
        /// 经销商名称
        /// </summary>
        public System.String name { get; set; }


 CoreCms.Net.Model/FromBody/FMDistribution.cs

@@ -18,15 +18,49 @@
{
    //API接口提交================================================
    /// <summary>
    ///     申请成为分销商接口提交参数
    ///     申请成为经销商接口提交参数
    /// </summary>
    public class FMDistributionApply
    {
       
        public string agreement { get; set; }
      /// <summary>
      /// 电话
      /// </summary>
        public string mobile { get; set; }
        /// <summary>
        /// 联系人
        /// </summary>
        public string name { get; set; }
        public string qq { get; set; }
        public string weixin { get; set; }
        /// <summary>
        /// 店铺名称
        /// </summary>
              public string storeName { get; set; }
        /// <summary>
        /// 地址分类
        /// </summary>
        public string areaCode {  get; set; }

        /// <summary>
        /// 详细地址
        /// </summary>
        public string address { get; set; }

        /// <summary>
        /// 店铺门头
        /// </summary>
        public string storeBanner { get; set; }
        //public string qq { get; set; }
        //public string weixin { get; set; }
        /// <summary>
        /// 销售额度
        /// </summary>
        public decimal sales {  get; set; }

        /// <summary>
        /// 所属行业
        /// </summary>
        public string profession { get; set; }
    }


@@ -42,7 +76,7 @@
    }

    /// <summary>
    /// 后台创建分销商提交参数
    /// 后台创建经销商提交参数
    /// </summary>
    public class FMAdminCreateDistributionPost
    {
@@ -58,7 +92,7 @@
        public System.Int32 userId { get; set; }

        /// <summary>
        /// 分销商名称
        /// 经销商名称
        /// </summary>
        public System.String name { get; set; }


 CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionRankingDTO.cs

@@ -15,13 +15,13 @@
    public class DistributionRankingDTO
    {
        /// <summary>
        ///     分销商序列
        ///     经销商序列
        /// </summary>
        public int id { get; set; }


        /// <summary>
        ///     分销商昵称
        ///     经销商昵称
        /// </summary>
        public string nickname { get; set; }


 CoreCms.Net.Model/bin/Debug/net8.0/CoreCms.Net.Model.xml

@@ -405,7 +405,7 @@
            代理商订单记录表
            </summary>
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.#ctor">
@@ -470,7 +470,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.distributorName">
            <summary>
            分销商
            经销商
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.goodsAmount">
@@ -1924,15 +1924,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistribution">
            <summary>
            分销商表
            经销商表
            </summary>
            <summary>
                分销商表
                经销商表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistribution.#ctor">
            <summary>
            分销商表
            经销商表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.id">
@@ -1947,7 +1947,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.gradeId">
@@ -2013,6 +2013,26 @@
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.isDelete">
            <summary>
            是否删除
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.areaCode">
            <summary>
            店铺区域
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.address">
            <summary>
            地址详情
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.sales">
            <summary>
            年销售额
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.profession">
            <summary>
            所属行业
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.TotalSettlementAmount">
@@ -2092,15 +2112,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition">
            <summary>
            分销商等级升级条件
            经销商等级升级条件
            </summary>
            <summary>
                分销商等级升级条件
                经销商等级升级条件
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.#ctor">
            <summary>
            分销商等级升级条件
            经销商等级升级条件
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.id">
@@ -2130,12 +2150,12 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade">
            <summary>
            分销商等级设置表
            经销商等级设置表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.#ctor">
            <summary>
            分销商等级设置表
            经销商等级设置表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.id">
@@ -2170,15 +2190,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder">
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
            <summary>
                分销商订单记录表
                经销商订单记录表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.#ctor">
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.id">
@@ -2188,7 +2208,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.userId">
            <summary>
            用户分销商id
            用户经销商id
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.buyUserId">
@@ -2243,7 +2263,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.distributorName">
            <summary>
                分销商
                经销商
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.goodsAmount">
@@ -9068,7 +9088,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.gradeId">
@@ -9253,7 +9273,47 @@
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMDistributionApply">
            <summary>
                申请成为分销商接口提交参数
                申请成为经销商接口提交参数
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.mobile">
            <summary>
            电话
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.name">
            <summary>
            联系人
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeName">
            <summary>
            店铺名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.areaCode">
            <summary>
            地址分类
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.address">
            <summary>
            详细地址
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeBanner">
            <summary>
            店铺门头
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.sales">
            <summary>
            销售额度
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.profession">
            <summary>
            所属行业
            </summary>
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMSetDistributionStorePost">
@@ -9263,7 +9323,7 @@
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost">
            <summary>
            后台创建分销商提交参数
            后台创建经销商提交参数
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.registeredUserMobile">
@@ -9278,7 +9338,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.gradeId">
@@ -11203,12 +11263,12 @@
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.id">
            <summary>
                分销商序列
                经销商序列
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.nickname">
            <summary>
                分销商昵称
                经销商昵称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.createtime">

 CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs

@@ -17,7 +17,7 @@
namespace CoreCms.Net.RedisMQ
{
    /// <summary>
    /// 订单完结后走代理或分销商提成处理
    /// 订单完结后走代理或经销商提成处理
    /// </summary>
    public class OrderAgentOrDistributionSubscribe : IRedisSubscribe
    {
@@ -41,7 +41,7 @@
        }

        /// <summary>
        /// 订单完结后走代理或分销商提成处理
        /// 订单完结后走代理或经销商提成处理
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
@@ -75,14 +75,14 @@
                        case (int)GlobalEnumVars.CommissionChannel.仅分销 when openDistribution == 1:
                        {
                            var jm = await _distributionOrderServices.AddData(order); //添加分享关联订单日志
                            //判断是否可以成为分销商
                            //判断是否可以成为经销商
                            //先判断是否已经是经销商了。
                            bool check = await _distributionServices.ExistsAsync(p => p.userId == order.userId);
                            var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0);
                            if (distributionType == 3)  //无需审核，但是要满足提交
                            {
                                var info = new CoreCmsDistribution();
                                //判断是否分销商
                                //判断是否经销商
                                if (check == false)
                                {
                                    await _distributionServices.CheckCondition(allConfigs, info, order.userId);
@@ -121,14 +121,14 @@
                            }

                            await _distributionOrderServices.AddData(order); //添加分享关联订单日志
                            //判断是否可以成为分销商
                            //判断是否可以成为经销商
                            //先判断是否已经是经销商了。
                            bool check = await _distributionServices.ExistsAsync(p => p.userId == order.userId);
                            var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0);
                            if (distributionType == 3)  //无需审核，但是要满足提交
                            {
                                var info = new CoreCmsDistribution();
                                //判断是否分销商
                                //判断是否经销商
                                if (check == false)
                                {
                                    await _distributionServices.CheckCondition(allConfigs, info, order.userId);
@@ -167,7 +167,7 @@
                                if (distributionType == 3)  //无需审核，但是要满足提交
                                {
                                    var info = new CoreCmsDistribution();
                                    //判断是否分销商
                                    //判断是否经销商
                                    if (check == false)
                                    {
                                        await _distributionServices.CheckCondition(allConfigs, info, order.userId);

 CoreCms.Net.RedisMQ/OrderFinishCommandSubscribe.cs

@@ -57,7 +57,7 @@
                }
                else
                {
                    //对已经计入分销佣金订单表里面的数据进行储值到分销商余额内。
                    //对已经计入分销佣金订单表里面的数据进行储值到经销商余额内。
                    await _distributionOrderServices.FinishOrder(msg);
                    //对已经计入代理商佣金订单表里面的数据进行储值到代理商余额内。
                    await _agentOrderServices.FinishOrder(msg);

 CoreCms.Net.Repository/Distribution/CoreCmsDistributionConditionRepository.cs

@@ -24,7 +24,7 @@
namespace CoreCms.Net.Repository
{
    /// <summary>
    /// 分销商等级升级条件 接口实现
    /// 经销商等级升级条件 接口实现
    /// </summary>
    public class CoreCmsDistributionConditionRepository : BaseRepository<CoreCmsDistributionCondition>, ICoreCmsDistributionConditionRepository
    {

 CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs

@@ -24,7 +24,7 @@
namespace CoreCms.Net.Repository
{
    /// <summary>
    /// 分销商等级设置表 接口实现
    /// 经销商等级设置表 接口实现
    /// </summary>
    public class CoreCmsDistributionGradeRepository : BaseRepository<CoreCmsDistributionGrade>, ICoreCmsDistributionGradeRepository
    {

 CoreCms.Net.Repository/Distribution/CoreCmsDistributionOrderRepository.cs

@@ -25,7 +25,7 @@
namespace CoreCms.Net.Repository
{
    /// <summary>
    /// 分销商订单记录表 接口实现
    /// 经销商订单记录表 接口实现
    /// </summary>
    public class CoreCmsDistributionOrderRepository : BaseRepository<CoreCmsDistributionOrder>, ICoreCmsDistributionOrderRepository
    {

 CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs

@@ -23,7 +23,7 @@
namespace CoreCms.Net.Repository
{
    /// <summary>
    /// 分销商表 接口实现
    /// 经销商表 接口实现
    /// </summary>
    public class CoreCmsDistributionRepository : BaseRepository<CoreCmsDistribution>, ICoreCmsDistributionRepository
    {

 CoreCms.Net.Services/Agent/CoreCmsAgentServices.cs

@@ -57,10 +57,10 @@
        }


        #region 获取分销商信息
        #region 获取经销商信息

        /// <summary>
        ///     获取分销商信息
        ///     获取经销商信息
        /// </summary>
        /// <param name="userId">用户id</param>
        /// <returns></returns>

 CoreCms.Net.Services/Distribution/CoreCmsDistributionConditionServices.cs

@@ -25,7 +25,7 @@
namespace CoreCms.Net.Services
{
    /// <summary>
    /// 分销商等级升级条件 接口实现
    /// 经销商等级升级条件 接口实现
    /// </summary>
    public class CoreCmsDistributionConditionServices : BaseServices<CoreCmsDistributionCondition>, ICoreCmsDistributionConditionServices
    {

 CoreCms.Net.Services/Distribution/CoreCmsDistributionGradeServices.cs

@@ -25,7 +25,7 @@
namespace CoreCms.Net.Services
{
    /// <summary>
    /// 分销商等级设置表 接口实现
    /// 经销商等级设置表 接口实现
    /// </summary>
    public class CoreCmsDistributionGradeServices : BaseServices<CoreCmsDistributionGrade>, ICoreCmsDistributionGradeServices
    {

 CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs

@@ -30,7 +30,7 @@
namespace CoreCms.Net.Services
{
    /// <summary>
    /// 分销商订单记录表 接口实现
    /// 经销商订单记录表 接口实现
    /// </summary>
    public class CoreCmsDistributionOrderServices : BaseServices<CoreCmsDistributionOrder>, ICoreCmsDistributionOrderServices
    {
@@ -143,7 +143,7 @@
            if (user != null)
            {
                var commission = await _distributionServices.GetGradeAndCommission(user.id);
                if (commission.status && commission.data != null) //不是分销商的，不返利。
                if (commission.status && commission.data != null) //不是经销商的，不返利。
                {
                    var ommissionDto = commission.data as DistributionDto;
                    //直返本级

 CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs

@@ -33,7 +33,7 @@
namespace CoreCms.Net.Services
{
    /// <summary>
    /// 分销商表 接口实现
    /// 经销商表 接口实现
    /// </summary>
    public class CoreCmsDistributionServices : BaseServices<CoreCmsDistribution>, ICoreCmsDistributionServices
    {
@@ -64,9 +64,9 @@
            _unitOfWork = unitOfWork;
        }

        #region 获取分销商信息
        #region 获取经销商信息
        /// <summary>
        /// 获取分销商信息
        /// 获取经销商信息
        /// </summary>
        /// <param name="userId">用户id</param>
        /// <param name="checkStatus">是否检查满足条件</param>
@@ -262,14 +262,14 @@
        }
        #endregion

        #region 检查是否可以成为分销商
        //检查是否可以成为分销商
        #region 检查是否可以成为经销商
        //检查是否可以成为经销商
        public async Task CheckCondition(Dictionary<string, DictionaryKeyValues> allConfigs, CoreCmsDistribution info, int userId = 0)
        {
            //判断消费
            info.ConditionStatus = false;//条件状态
            info.ConditionProgress = 0;
            //获取成为分销商条件
            //获取成为经销商条件
            //var DistributionType = CommonHelper.GetConfigDictionary(allConfigs, GlobalSettingConstVars.DistributionType).ObjectToInt(0);
            var distributionMoney = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionMoney).ObjectToInt(0);
            //支付金额
@@ -305,7 +305,7 @@
                        }
                        else
                        {
                            info.ConditionMsg = "您的条件未满足，请任意购买一件商品即可成为分销商。";
                            info.ConditionMsg = "您的条件未满足，请任意购买一件商品即可成为经销商。";
                        }
                    }
                    else if (distributionGoods is > 0 and 3) //购买指定商品
@@ -324,11 +324,11 @@
                            var goodsInfo = await _goodsRepository.QueryByIdAsync(distributionGoodsId);
                            if (goodsInfo != null)
                            {
                                info.ConditionMsg = "您的条件未满足，请购买指定的【" + goodsInfo.name + "】商品即可成为分销商。";
                                info.ConditionMsg = "您的条件未满足，请购买指定的【" + goodsInfo.name + "】商品即可成为经销商。";
                            }
                            else
                            {
                                info.ConditionMsg = "您的条件未满足，请购买指定的商品即可成为分销商。";
                                info.ConditionMsg = "您的条件未满足，请购买指定的商品即可成为经销商。";

                            }
                        }
@@ -409,7 +409,7 @@
            var info = await _dal.QueryByClauseAsync(p => p.userId == userId);
            if (info == null)
            {
                jm.msg = "不是分销商的，不返利";
                jm.msg = "不是经销商的，不返利";
                return jm;
            }
            var allConfigs = await _settingServices.GetConfigDictionaries();
@@ -477,7 +477,7 @@
            var info = await _dal.QueryByClauseAsync(p => p.userId == userId);
            if (info is { gradeId: > 0 })
            {
                //找下有没有可以升级的分销商等级（一次只升一级）
                //找下有没有可以升级的经销商等级（一次只升一级）
                var grade = await _distributionGradeRepository.QueryByClauseAsync(p => p.sortId > info.gradeId && p.isAutoUpGrade == true, p => p.sortId, OrderByType.Asc, true);
                if (grade == null) return jm;
                {

 CoreCms.Net.Services/User/CoreCmsUserServices.cs

@@ -706,8 +706,8 @@
                            (int)GlobalEnumVars.UserPointSourceTypes.PointTypeInviterUser, "发展用户：" + userId + "赠送积分");
                }

                //是否默认注册分销商
                var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(); //是否默认注册分销商
                //是否默认注册经销商
                var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(); //是否默认注册经销商
                if (distributionType == (int)GlobalEnumVars.DistributionConditionType.RegOpen)
                {
                    var iData = new CoreCmsDistribution();

 CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js

@@ -266,9 +266,9 @@
    let getPageConfig = (params, config = {}) => http.post('/Api/Page/GetPageConfig', params, { custom: { methodName: 'pages.getpageconfig', needToken: false } });


    // 获取分销商进度状态
    // 获取经销商进度状态
    let getDistributionInfo = (params, config = {}) => http.post('/Api/Distribution/Info', params, { custom: { methodName: 'distribution_center-api-info', needToken: true } });
    // 申请分销商
    // 申请经销商
    let applyDistribution = (params, config = {}) => http.post('/Api/Distribution/ApplyDistribution', params, { custom: { methodName: 'distribution_center-api-applydistribution', needToken: true } });
    // 店铺设置
    let setDistributionStore = (params, config = {}) => http.post('/Api/Distribution/SetStore', params, { custom: { methodName: 'distribution_center-api-setstore', needToken: true } });
@@ -280,7 +280,7 @@
    let getDistributionTeamSum = (params, config = {}) => http.post('/Api/Distribution/GetTeamSum', params, { custom: { methodName: 'distribution.getTeamSum', needToken: true } });
    //分销订单统计
    let getDistributionOrderSum = (params, config = {}) => http.post('/Api/Distribution/GetOrderSum', params, { custom: { methodName: 'distribution.getOrderSum', needToken: true } });
    //获取分销商排行
    //获取经销商排行
    let getDistributionRanking = (params, config = {}) => http.post('/Api/Distribution/getDistributionRanking', params, { custom: { methodName: 'distribution.getDistributionRanking', needToken: true } });

    // 获取代理商进度状态

 CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue

@@ -213,7 +213,7 @@
                    }
                });
            },
            //获取分销商信息
            //获取经销商信息
            getAgent: function (store) {
                let _this = this;
                _this.$u.api.getAgentStoreInfo({

 CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue

@@ -115,7 +115,7 @@
                    //    router: '/pages/member/agent/shareLog/shareLog'
                    //},
                },
                info: {}, //分销商信息
                info: {}, //经销商信息
                userInfo: {}, // 用户信息
                shareUrl: this.$globalConstVars.shareUrl
            }

 CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue

@@ -99,7 +99,7 @@
        data() {
            return {
                showMoney: false, //是否显示金额
                info: {}, //分销商信息
                info: {}, //经销商信息
                userInfo: {}, // 用户信息
                //日期选择
                showCalendar: false,

 CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue

@@ -28,7 +28,7 @@
                </view>
            </view>
            <!--标题-->
            <view class="coreshop-text-black coreshop-font-md  coreshop-padding-10 coreshop-solid-bottom">分销商须知</view>
            <view class="coreshop-text-black coreshop-font-md  coreshop-padding-10 coreshop-solid-bottom">经销商须知</view>
            <!--内容-->
            <view class="coreshop-text-gray coreshop-margin-20">
                <u-parse :content="distributionNotes" :selectable="true"></u-parse>

 CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue

@@ -211,7 +211,7 @@
                    }
                });
            },
            //获取分销商信息
            //获取经销商信息
            getDistribution: function (store) {
                let _this = this;
                _this.$u.api.getDistributionStoreInfo({

 CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue

@@ -114,7 +114,7 @@
                    //    router: '/pages/member/distribution/shareLog/shareLog'
                    //},
                },
                info: {}, //分销商信息
                info: {}, //经销商信息
                userInfo: {}, // 用户信息
            }
        },

 CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue

@@ -205,7 +205,7 @@
                    _this.gotoIndex();
                }
            },
            //跳转分销商商家门店
            //跳转经销商商家门店
            gotoStore(id) {
                if (id) {
                    uni.$u.route({

 CoreCms.Net.Utility/bin/Debug/net8.0/CoreCms.Net.Model.xml

@@ -405,7 +405,7 @@
            代理商订单记录表
            </summary>
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.#ctor">
@@ -470,7 +470,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.distributorName">
            <summary>
            分销商
            经销商
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.goodsAmount">
@@ -1924,15 +1924,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistribution">
            <summary>
            分销商表
            经销商表
            </summary>
            <summary>
                分销商表
                经销商表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistribution.#ctor">
            <summary>
            分销商表
            经销商表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.id">
@@ -1947,7 +1947,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.gradeId">
@@ -2013,6 +2013,26 @@
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.isDelete">
            <summary>
            是否删除
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.areaCode">
            <summary>
            店铺区域
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.address">
            <summary>
            地址详情
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.sales">
            <summary>
            年销售额
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.profession">
            <summary>
            所属行业
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.TotalSettlementAmount">
@@ -2092,15 +2112,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition">
            <summary>
            分销商等级升级条件
            经销商等级升级条件
            </summary>
            <summary>
                分销商等级升级条件
                经销商等级升级条件
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.#ctor">
            <summary>
            分销商等级升级条件
            经销商等级升级条件
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.id">
@@ -2130,12 +2150,12 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade">
            <summary>
            分销商等级设置表
            经销商等级设置表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.#ctor">
            <summary>
            分销商等级设置表
            经销商等级设置表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.id">
@@ -2170,15 +2190,15 @@
        </member>
        <member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder">
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
            <summary>
                分销商订单记录表
                经销商订单记录表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.#ctor">
            <summary>
            分销商订单记录表
            经销商订单记录表
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.id">
@@ -2188,7 +2208,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.userId">
            <summary>
            用户分销商id
            用户经销商id
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.buyUserId">
@@ -2243,7 +2263,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.distributorName">
            <summary>
                分销商
                经销商
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.goodsAmount">
@@ -9068,7 +9088,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.gradeId">
@@ -9253,7 +9273,47 @@
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMDistributionApply">
            <summary>
                申请成为分销商接口提交参数
                申请成为经销商接口提交参数
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.mobile">
            <summary>
            电话
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.name">
            <summary>
            联系人
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeName">
            <summary>
            店铺名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.areaCode">
            <summary>
            地址分类
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.address">
            <summary>
            详细地址
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeBanner">
            <summary>
            店铺门头
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.sales">
            <summary>
            销售额度
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.profession">
            <summary>
            所属行业
            </summary>
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMSetDistributionStorePost">
@@ -9263,7 +9323,7 @@
        </member>
        <member name="T:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost">
            <summary>
            后台创建分销商提交参数
            后台创建经销商提交参数
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.registeredUserMobile">
@@ -9278,7 +9338,7 @@
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.name">
            <summary>
            分销商名称
            经销商名称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.gradeId">
@@ -11203,12 +11263,12 @@
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.id">
            <summary>
                分销商序列
                经销商序列
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.nickname">
            <summary>
                分销商昵称
                经销商昵称
            </summary>
        </member>
        <member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.createtime">

 CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs

@@ -934,11 +934,11 @@

        #endregion

        #region 后台生成分销商小程序码============================================================
        #region 后台生成经销商小程序码============================================================

        // POST: Api/Tools/GetDistributionWxCode
        /// <summary>
        ///     后台生成分销商小程序码
        ///     后台生成经销商小程序码
        /// </summary>
        /// <returns></returns>
        [HttpPost]

 CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs

@@ -33,9 +33,9 @@
namespace CoreCms.Net.Web.Admin.Controllers
{
    /// <summary>
    ///     分销商表
    ///     经销商表
    /// </summary>
    [Description("分销商表")]
    [Description("经销商表")]
    [Route("api/[controller]/[action]")]
    [ApiController]
    [RequiredErrorForAdmin]
@@ -115,7 +115,7 @@
            //用户Id int
            var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
            if (userId > 0) where = where.And(p => p.userId == userId);
            //分销商名称 nvarchar
            //经销商名称 nvarchar
            var name = Request.Form["name"].FirstOrDefault();
            if (!string.IsNullOrEmpty(name)) where = where.And(p => p.name.Contains(name));
            //分销等级 int
@@ -301,7 +301,7 @@
            var isDistribution = await _coreCmsDistributionServices.ExistsAsync(p => p.userId == user.id);
            if (isDistribution)
            {
                jm.msg = "提交的【已注册手机号】已经是分销商了。";
                jm.msg = "提交的【已注册手机号】已经是经销商了。";
                return jm;
            }
            var model = new CoreCmsDistribution();

 CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs

@@ -32,9 +32,9 @@
namespace CoreCms.Net.Web.Admin.Controllers
{
    /// <summary>
    ///     分销商等级设置表
    ///     经销商等级设置表
    /// </summary>
    [Description("分销商等级设置表")]
    [Description("经销商等级设置表")]
    [Route("api/[controller]/[action]")]
    [ApiController]
    [RequiredErrorForAdmin]

 CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs

@@ -34,9 +34,9 @@
namespace CoreCms.Net.Web.Admin.Controllers
{
    /// <summary>
    /// 分销商订单记录表
    /// 经销商订单记录表
    ///</summary>
    [Description("分销商订单记录表")]
    [Description("经销商订单记录表")]
    [Route("api/[controller]/[action]")]
    [ApiController]
    [RequiredErrorForAdmin]
@@ -105,7 +105,7 @@
            {
                where = where.And(p => p.id == id);
            }
            //用户分销商id int
            //用户经销商id int
            var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
            if (userId > 0)
            {
@@ -284,7 +284,7 @@
            mySheet.SetColumnWidth(0, 10 * 256);

            var cell1 = headerRow.CreateCell(1);
            cell1.SetCellValue("用户分销商id");
            cell1.SetCellValue("用户经销商id");
            cell1.CellStyle = headerStyle;
            mySheet.SetColumnWidth(1, 10 * 256);

@@ -420,7 +420,7 @@
            {
                where = where.And(p => p.id == id);
            }
            //用户分销商id int
            //用户经销商id int
            var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
            if (userId > 0)
            {
@@ -491,7 +491,7 @@
            mySheet.SetColumnWidth(0, 10 * 256);

            var cell1 = headerRow.CreateCell(1);
            cell1.SetCellValue("用户分销商id");
            cell1.SetCellValue("用户经销商id");
            cell1.CellStyle = headerStyle;
            mySheet.SetColumnWidth(1, 10 * 256);


 CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj

@@ -626,6 +626,9 @@
  </ItemGroup>

  <ItemGroup>
    <Content Update="NLog.config">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Update="wwwroot\views\content\advert\advertisement\create.html">
      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>

 CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj.user

@@ -5,5 +5,6 @@
  </PropertyGroup>
  <PropertyGroup>
    <ActiveDebugProfile>CoreCms.Net.Web.Admin</ActiveDebugProfile>
    <NameOfLastUsedPublishProfile>E:\workdir\百分百商城后台\CoreCms.Net.Web.Admin\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
  </PropertyGroup>
</Project>

 CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml

@@ -771,7 +771,7 @@
        </member>
        <member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.GetDistributionWxCode(CoreCms.Net.Model.FromBody.FMIntId)">
            <summary>
                后台生成分销商小程序码
                后台生成经销商小程序码
            </summary>
            <returns></returns>
        </member>
@@ -923,7 +923,7 @@
        </member>
        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionController">
            <summary>
                分销商表
                经销商表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsDistributionServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsDistributionGradeServices,CoreCms.Net.IServices.ICoreCmsUserServices)">
@@ -986,7 +986,7 @@
        </member>
        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionGradeController">
            <summary>
                分销商等级设置表
                经销商等级设置表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionGradeController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsDistributionGradeServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsDistributionConditionServices,CoreCms.Net.IServices.ICoreCmsDistributionResultServices)">
@@ -1136,7 +1136,7 @@
        </member>
        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionOrderController">
             <summary>
             分销商订单记录表
             经销商订单记录表
            </summary>
        </member>
        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsDistributionOrderServices)">

 CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml

New file
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
  <PropertyGroup>
    <DeleteExistingFiles>false</DeleteExistingFiles>
    <ExcludeApp_Data>false</ExcludeApp_Data>
    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\百分百兵法\amdin</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <_TargetId>Folder</_TargetId>
    <SiteUrlToLaunchAfterPublish />
    <TargetFramework>net8.0</TargetFramework>
    <ProjectGuid>95487ef2-3942-4f9b-8ece-acd7a4b304d9</ProjectGuid>
    <SelfContained>false</SelfContained>
  </PropertyGroup>
</Project>

 CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml.user

New file
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\百分百兵法\amdin</_PublishTargetUrl>
    <History>True|2024-03-05T03:41:33.0893153Z||;True|2024-03-05T11:40:03.2217071+08:00||;True|2024-03-05T11:36:59.7527058+08:00||;True|2024-03-05T11:28:53.3016177+08:00||;True|2024-03-05T11:25:36.1455179+08:00||;True|2024-03-05T11:21:14.3434416+08:00||;True|2024-03-05T11:19:24.1653295+08:00||;True|2024-03-05T11:09:56.2458501+08:00||;True|2024-03-05T11:07:48.5516657+08:00||;True|2024-03-05T11:02:55.2646393+08:00||;True|2024-03-05T10:56:05.2900663+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 CoreCms.Net.Web.Admin/appsettings.json

@@ -92,8 +92,8 @@
    "WeiXinEncodingAesKey": "",
    "WeiXinToken": "",
    //小程序
    "WxOpenAppId": "wx82d29cbe0ad39d47",
    "WxOpenAppSecret": "fe7395fe3eecd00e4a40e590eb835f31",
    "WxOpenAppId": "wx45d700a970238807",
    "WxOpenAppSecret": "3e9e4e68695ffc62f51b5ec1d1ddf942",
    "WxOpenToken": "",
    "WxOpenEncodingAESKey": ""
  }

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html

@@ -10,9 +10,9 @@
        </div>

        <div class="layui-form-item">
            <label for="name" class="layui-form-label  layui-form-required">分销商名称</label>
            <label for="name" class="layui-form-label  layui-form-required">经销商名称</label>
            <div class="layui-input-inline">
                <input name="name" lay-verify="required|verifyname" class="layui-input" placeholder="请输入分销商名称" lay-reqText="请输入分销商名称" />
                <input name="name" lay-verify="required|verifyname" class="layui-input" placeholder="请输入经销商名称" lay-reqText="请输入经销商名称" />
            </div>
            <label for="mobile" class="layui-form-label  layui-form-required">联系手机号</label>
            <div class="layui-input-inline">
@@ -87,7 +87,7 @@
                });
                form.verify({

                    verifyname: [/^.{0,255}$/, '分销商名称最大只允许输入255位字符'],
                    verifyname: [/^.{0,255}$/, '经销商名称最大只允许输入255位字符'],
                    verifymobile: [/^.{0,50}$/, '手机号最大只允许输入50位字符'],
                    verifyweixin: [/^.{0,50}$/, '微信号最大只允许输入50位字符'],
                    verifyqq: [/^.{0,50}$/, 'qq号最大只允许输入50位字符'],

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html

@@ -22,7 +22,7 @@

            <tr>
                <td>
                    <label for="name">分销商名称</label>
                    <label for="name">经销商名称</label>
                </td>
                <td>
                    {{ d.params.data.model.name || '' }}

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html

@@ -4,9 +4,9 @@
        <input type="hidden" name="userId" value="{{d.params.data.model.userId || '' }}" />

        <div class="layui-form-item">
            <label for="name" class="layui-form-label  layui-form-required">分销商名称</label>
            <label for="name" class="layui-form-label  layui-form-required">经销商名称</label>
            <div class="layui-input-inline">
                <input name="name" lay-verify="required|verifyname" class="layui-input" placeholder="请输入分销商名称" lay-reqText="请输入分销商名称" value="{{d.params.data.model.name || '' }}" />
                <input name="name" lay-verify="required|verifyname" class="layui-input" placeholder="请输入经销商名称" lay-reqText="请输入经销商名称" value="{{d.params.data.model.name || '' }}" />
            </div>
            <label for="mobile" class="layui-form-label  layui-form-required">手机号</label>
            <div class="layui-input-inline">
@@ -80,7 +80,7 @@
                });
                form.verify({

                    verifyname: [/^[\S]{0,255}$/, '分销商名称最大只允许输入255位字符，且不能出现空格'],
                    verifyname: [/^[\S]{0,255}$/, '经销商名称最大只允许输入255位字符，且不能出现空格'],
                    verifymobile: [/^[\S]{0,50}$/, '手机号最大只允许输入50位字符，且不能出现空格'],
                    verifyweixin: [/^[\S]{0,50}$/, '微信号最大只允许输入50位字符，且不能出现空格'],
                    verifyqq: [/^[\S]{0,50}$/, 'qq号最大只允许输入50位字符，且不能出现空格'],

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html

@@ -1,4 +1,4 @@
<title>分销商表</title>
<title>经销商表</title>
<!--当前位置开始-->
<div class="layui-card layadmin-header">
    <div class="layui-breadcrumb" lay-filter="breadcrumb">
@@ -23,12 +23,12 @@

            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input type="number" name="id" placeholder="分销商序列" class="layui-input">
                    <input type="number" name="id" placeholder="经销商序列" class="layui-input">
                </div>
            </div>
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input type="text" name="name" placeholder="请输入分销商名称" class="layui-input">
                    <input type="text" name="name" placeholder="请输入经销商名称" class="layui-input">
                </div>
            </div>

@@ -173,7 +173,7 @@
                                    }
                                }
                            },
                            { field: 'name', title: '分销商名称', sort: false, width: 105 },
                            { field: 'name', title: '经销商名称', sort: false, width: 105 },
                            {
                                field: 'gradeId', title: '分销等级', sort: false, width: 90, templet: function (data) {
                                    for (var i = 0; i < d.data.grades.length; i++) {

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/create.html

@@ -13,7 +13,7 @@
            <div class="layui-input-inline layui-inline-2">
                <input type="checkbox" lay-filter="switch" name="isDefault" lay-skin="switch" lay-text="开启|关闭">
            </div>
            <div class="layui-form-mid layui-word-aux">当前等级是否默认分销商等级</div>
            <div class="layui-form-mid layui-word-aux">当前等级是否默认经销商等级</div>
        </div>

        <div class="layui-form-item">

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/edit.html

@@ -14,7 +14,7 @@
            <div class="layui-input-inline layui-inline-2">
                <input type="checkbox" lay-filter="switch" name="isDefault" {{ d.params.data.model.isDefault ? 'checked' : '' }} lay-skin="switch" lay-text="是|否">
            </div>
            <div class="layui-form-mid layui-word-aux">当前等级是否默认分销商等级</div>
            <div class="layui-form-mid layui-word-aux">当前等级是否默认经销商等级</div>
        </div>

        <div class="layui-form-item">

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/index.html

@@ -1,4 +1,4 @@
<title>分销商等级设置表</title>
<title>经销商等级设置表</title>
<!--当前位置开始-->
<div class="layui-card layadmin-header">
    <div class="layui-breadcrumb" lay-filter="breadcrumb">

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/details.html

@@ -17,7 +17,7 @@

            <tr>
                <td>
                    <label for="userId">用户分销商id</label>
                    <label for="userId">用户经销商id</label>
                </td>
                <td>
                    {{ d.params.data.userId || '' }}

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/index.html

@@ -1,4 +1,4 @@
<title>分销商订单记录表</title>
<title>经销商订单记录表</title>
<!--当前位置开始-->
<div class="layui-card layadmin-header">
    <div class="layui-breadcrumb" lay-filter="breadcrumb">
@@ -22,7 +22,7 @@
        <div class="layui-form-item">
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input type="text" name="distributorName" placeholder="请输入用户分销商" class="layui-input">
                    <input type="text" name="distributorName" placeholder="请输入用户经销商" class="layui-input">
                </div>
            </div>
            <div class="layui-inline">
@@ -126,7 +126,7 @@
                        [
                            //{ type: "checkbox", fixed: "left" },
                            { field: 'id', title: '序列', width: 60, sort: false },
                            { field: 'userId', title: '用户分销商', sort: false, templet: function (data) { return data.distributorName + "（" + data.userId + "）" } },
                            { field: 'userId', title: '用户经销商', sort: false, templet: function (data) { return data.distributorName + "（" + data.userId + "）" } },
                            { field: 'buyUserId', title: '下单用户', sort: false, templet: function (data) { return data.buyUserNickName + "（" + data.buyUserId + "）" } },
                            { field: 'orderId', title: '订单编号', sort: false },
                            { field: 'amount', title: '结算金额', sort: false, width: 105, templet: function (data) { return '￥' + data.amount } },

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html

@@ -64,7 +64,7 @@
                                        </div>

                                        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
                                            <legend>成为分销商</legend>
                                            <legend>成为经销商</legend>
                                        </fieldset>

                                        <div class="layui-form-item">
@@ -211,7 +211,7 @@
            });
            editor2.setData(d.data.configs['distributionAgreement']['sValue']);

            //监听购买商品成为分销商按钮
            //监听购买商品成为经销商按钮
            form.on('radio(distributionGoods)', function (data) {
                if (data.value === "3") {
                    $('#distributionGoods').show();

 CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html

@@ -285,7 +285,7 @@
                                                        <i class="layui-icon layui-icon-set"></i>确定
                                                    </button>
                                                </div>
                                                <label class="layui-form-label">    一级返现</label>
                                                <label class="layui-form-label">经销商返现</label>
                                                <div class="layui-input-inline layui-inline-2">
                                                    <input class="layui-input" id="oneKeySetLevelOne">
                                                </div>
@@ -450,15 +450,15 @@
                <th>货号</th>
                <th>SKU</th>
                <th>重量(克)</th>
                <th>赠送积分</th>
                <th>积分最大<br />可抵金额</th>
                <!-- <th>赠送积分</th>
                <th>积分最大<br />可抵金额</th> -->
                <th>库存</th>
                <th><i class="required-color">*</i>销售价</th>
                <th>成本价</th>
                <th>市场价</th>
                <th>一级返现</th>
                <th>二级返现</th>
                <th>三级返现</th>
                <th>经销商返现</th>
                <!-- <th>二级返现</th>
                <th>三级返现</th> -->
                <th>操作</th>
            </tr>
        </thead>
@@ -499,12 +499,12 @@
                <td>
                    <input type="number" name="product[weight][]" value="{{item.weight}}" placeholder="重量" class="layui-input layui-inline-1">
                </td>
                <td>
                <!-- <td>
                    <input type="number" name="product[points][]" value="{{item.points}}" placeholder="积分" class="layui-input layui-inline-1">
                </td>
                <td>
                </td> -->
                <!-- <td>
                    <input type="text" name="product[pointsDeduction][]" value="{{item.pointsDeduction}}" placeholder="金额" class="layui-input layui-inline-1">
                </td>
                </td> -->
                <td class="have-add-td">
                    <input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="库存" class="layui-input layui-inline-1 goods-stock">
                </td>
@@ -518,14 +518,14 @@
                    <input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="市场价" class="layui-input layui-inline-1">
                </td>
                <td>
                    <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="一级返现" class="layui-input layui-inline-1">
                    <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="经销商返现" class="layui-input layui-inline-1">
                </td>
                <td>
                <!-- <td>
                    <input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="二级返现" class="layui-input layui-inline-1">
                </td>
                <td>
                    <input type="text" name="product[levelThree][]" value="{{item.levelThree}}" placeholder="三级返现" class="layui-input layui-inline-1">
                </td>
                </td> -->
                <td>
                    <a class="layui-btn layui-btn-danger layui-btn-xs del-class" lay-active="delTr">删除</a>
                </td>

 CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html

@@ -312,15 +312,15 @@
                <th>货号</th>
                <th>SKU</th>
                <th>重量(克)</th>
                <th>赠送积分</th>
                <th>积分最大<br />可抵金额</th>
                <!-- <th>赠送积分</th>
                <th>积分最大<br />可抵金额</th> -->
                <th>库存</th>
                <th><i class="required-color">*</i>销售价</th>
                <th>成本价</th>
                <th>市场价</th>
                <th>一级返现</th>
                <th>二级返现</th>
                <th>三级返现</th>
                <!-- <th>二级返现</th>
                <th>三级返现</th> -->
                <th>冻结库存</th>
                <th>操作</th>
            </tr>
@@ -362,12 +362,12 @@
                <td>
                    <input type="number" name="product[weight][]" value="{{item.weight}}" placeholder="重量" class="layui-input layui-inline-1">
                </td>
                <td>
                <!-- <td>
                    <input type="number" name="product[points][]" value="{{item.points}}" placeholder="积分" class="layui-input layui-inline-1">
                </td>
                <td>
                </td> -->
                <!-- <td>
                    <input type="text" name="product[pointsDeduction][]" value="{{item.pointsDeduction}}" placeholder="金额" class="layui-input layui-inline-1">
                </td>
                </td> -->
                <td class="have-add-td">
                    <input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="库存" class="layui-input layui-inline-1 goods-stock">
                </td>
@@ -381,14 +381,14 @@
                    <input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="市场价" class="layui-input layui-inline-1">
                </td>
                <td>
                    <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="一级返现" class="layui-input layui-inline-1">
                    <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="经销商返现" class="layui-input layui-inline-1">
                </td>
                <td>
                <!-- <td>
                    <input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="二级返现" class="layui-input layui-inline-1">
                </td>
                <td>
                    <input type="text" name="product[levelThree][]" value="{{item.levelThree}}" placeholder="三级返现" class="layui-input layui-inline-1">
                </td>
                </td> -->
                <td>
                    {{item.freezeStock}}
                </td>

 CoreCms.Net.Web.Admin/wwwroot/views/index.html

@@ -49,7 +49,7 @@
                                        <li class="layui-col-xs3">
                                            <a href="javascript:;" lay-href="/distribution/distributor/">
                                                <i class="layui-icon layui-icon-snowflake"></i>
                                                <cite>分销商</cite>
                                                <cite>经销商</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">

 CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html

@@ -1237,7 +1237,7 @@
                }
            });

            //监听购买商品成为分销商按钮
            //监听购买商品成为经销商按钮
            form.on('radio(distributionGoods)', function (data) {
                if (data.value === "3") {
                    $('#distributionGoods').show();

 CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs

@@ -82,10 +82,10 @@

        //验证接口====================================================================================================

        #region 查询用户是否可以成为分销商
        #region 查询用户是否可以成为经销商

        /// <summary>
        ///     查询用户是否可以成为分销商
        ///     查询用户是否可以成为经销商
        /// </summary>
        /// <returns></returns>
        [HttpPost]
@@ -98,10 +98,10 @@

        #endregion

        #region 申请成为分销商接口
        #region 申请成为经销商接口

        /// <summary>
        ///     申请成为分销商接口
        ///     申请成为经销商接口
        /// </summary>
        /// <returns></returns>
        [HttpPost]
@@ -119,8 +119,12 @@
            var iData = new CoreCmsDistribution();
            iData.mobile = entity.mobile;
            iData.name = entity.name;
            iData.weixin = entity.weixin;
            iData.qq = entity.qq;
            iData.address = entity.address;
            iData.areaCode = entity.areaCode;
            iData.profession = entity.profession;
             iData.storeBanner = entity.storeBanner;
            iData.sales=entity.sales;
            iData.storeName = entity.storeName;
            jm = await _distributionServices.AddData(iData, _user.ID);

            return jm;
@@ -279,10 +283,10 @@

        #endregion

        #region 获取分销商排行
        #region 获取经销商排行

        /// <summary>
        ///     获取分销商排行
        ///     获取经销商排行
        /// </summary>
        /// <returns></returns>
        [HttpPost]

 CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml

@@ -342,13 +342,13 @@
        </member>
        <member name="M:CoreCms.Net.Web.WebApi.Controllers.DistributionController.Info">
            <summary>
                查询用户是否可以成为分销商
                查询用户是否可以成为经销商
            </summary>
            <returns></returns>
        </member>
        <member name="M:CoreCms.Net.Web.WebApi.Controllers.DistributionController.ApplyDistribution(CoreCms.Net.Model.FromBody.FMDistributionApply)">
            <summary>
                申请成为分销商接口
                申请成为经销商接口
            </summary>
            <returns></returns>
        </member>
@@ -378,7 +378,7 @@
        </member>
        <member name="M:CoreCms.Net.Web.WebApi.Controllers.DistributionController.GetDistributionRanking(CoreCms.Net.Model.FromBody.FMPageByIntId)">
            <summary>
                获取分销商排行
                获取经销商排行
            </summary>
            <returns></returns>
        </member>

 CoreCms.Net.Web.WebApi/appsettings.json

@@ -99,8 +99,8 @@
    "WeiXinEncodingAesKey": "",
    "WeiXinToken": "",
    //小程序
    "WxOpenAppId": "wx82d29cbe0ad39d47",
    "WxOpenAppSecret": "fe7395fe3eecd00e4a40e590eb835f31",
    "WxOpenAppId": "wx45d700a970238807",
    "WxOpenAppSecret": "3e9e4e68695ffc62f51b5ec1d1ddf942",
    "WxOpenToken": "",
    "WxOpenEncodingAESKey": ""
  }