diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs index c7fea1c1..b1c1e9bc 100644 --- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs +++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs @@ -284,22 +284,22 @@ namespace CoreCms.Net.Services info.ConditionProgress = 50; //判断是否需要购买商品 var distributionGoods = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionGoods).ObjectToInt(0); - if (distributionGoods > 0 && distributionGoods == 1) + if (distributionGoods is > 0 and 1) { - info.ConditionProgress = info.ConditionProgress + 50; + info.ConditionProgress += 50; info.ConditionStatus = true;//条件状态 info.ConditionMsg = "您的条件已满足,马上申请。"; } else { //任意商品 - if (distributionGoods > 0 && distributionGoods == 2) + if (distributionGoods is > 0 and 2) { var orderCount = await _orderRepository.GetCountAsync(p => p.userId == userId && p.payStatus == (int)GlobalEnumVars.OrderPayStatus.Yes); - if (orderCount > 1) + if (orderCount >= 1) { - info.ConditionProgress = info.ConditionProgress + 50; + info.ConditionProgress += 50; info.ConditionStatus = true;//条件状态 info.ConditionMsg = "您的条件已满足,马上申请。"; } @@ -308,14 +308,14 @@ namespace CoreCms.Net.Services info.ConditionMsg = "您的条件未满足,请任意购买一件商品即可成为分销商。"; } } - else if (distributionGoods > 0 && distributionGoods == 3) //购买指定商品 + else if (distributionGoods is > 0 and 3) //购买指定商品 { //判断是否购买指定商品 var distributionGoodsId = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionGoodsId).ObjectToInt(0); var orderNum = _orderRepository.GetOrderNum(userId, distributionGoodsId); if (orderNum >= 1) { - info.ConditionProgress = info.ConditionProgress + 50; + info.ConditionProgress += 50; info.ConditionStatus = true;//条件状态 info.ConditionMsg = "您的条件已满足,马上申请。"; }