baifenbaishop.git

			@@ -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;
			{