mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 17:23:26 +08:00
【优化】完善不开启分销，代理模式下，走邀请好友计算三级佣金；不开启分销或者代理的情况下，默认不去计算分销和代理佣金。
【调整】目前的分销三级业务逻辑是用户下单，往上找三级必须都是分销商，才能每级都分佣，中间可能不是分销商而中断向上递归，调整为用户下单，往上找三级只要三级有是分销商的，就根据佣金结果给与佣金。不中断。 【优化】区分老版本企业付款到零钱与新版本商家付款到零钱enum命名。
This commit is contained in:
大灰灰
@@ -55,70 +55,28 @@ namespace CoreCms.Net.RedisMQ
|
||||
if (order != null)
|
||||
{
|
||||
var allConfigs = await _settingServices.GetConfigDictionaries();
|
||||
|
||||
//是否开启三级分销(1开启，2未开启)
|
||||
var openDistribution = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OpenDistribution).ObjectToInt(0);
|
||||
//是否开启代理模块(1开启，2未开启)
|
||||
var isOpenAgent = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IsOpenAgent).ObjectToInt(0);
|
||||
//佣金分配模式
|
||||
var commissionChannel = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CommissionChannel).ObjectToInt(1);
|
||||
|
||||
if (commissionChannel == (int)GlobalEnumVars.CommissionChannel.仅代理)
|
||||
switch (commissionChannel)
|
||||
{
|
||||
var jm = await _agentOrderServices.AddData(order);
|
||||
jm.status = true;
|
||||
jm.msg = "分销成功";
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走代理结佣-仅代理", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
}
|
||||
else if (commissionChannel == (int)GlobalEnumVars.CommissionChannel.仅分销)
|
||||
{
|
||||
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) //无需审核，但是要满足提交
|
||||
case (int)GlobalEnumVars.CommissionChannel.仅代理 when isOpenAgent == 1:
|
||||
{
|
||||
var info = new CoreCmsDistribution();
|
||||
//判断是否分销商
|
||||
if (check == false)
|
||||
{
|
||||
await _distributionServices.CheckCondition(allConfigs, info, order.userId);
|
||||
if (info.ConditionStatus == true && info.ConditionProgress == 100)
|
||||
{
|
||||
//添加用户
|
||||
var user = await _userServices.QueryByClauseAsync(p => p.id == order.userId);
|
||||
var iData = new CoreCmsDistribution();
|
||||
iData.userId = order.userId;
|
||||
iData.mobile = user.mobile;
|
||||
iData.name = !string.IsNullOrEmpty(user.nickName) ? user.nickName : user.mobile;
|
||||
iData.verifyStatus = (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes;
|
||||
iData.verifyTime = DateTime.Now;
|
||||
|
||||
await _distributionServices.AddData(iData, order.userId);
|
||||
}
|
||||
}
|
||||
}
|
||||
//已经是经销商的判断是否可以升级
|
||||
if (check)
|
||||
{
|
||||
await _distributionServices.CheckUpdate(order.userId);
|
||||
}
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走分销结佣-仅分销", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
}
|
||||
else if (commissionChannel == (int)GlobalEnumVars.CommissionChannel.先代理后分销)
|
||||
{
|
||||
|
||||
var jm = await _agentOrderServices.AddData(order);
|
||||
|
||||
//判断是走代理还是走分销
|
||||
if (jm.status == true)
|
||||
{
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走代理结佣-先代理后分销", JsonConvert.SerializeObject(jm));
|
||||
var jm = await _agentOrderServices.AddData(order);
|
||||
jm.status = true;
|
||||
jm.msg = "分销成功";
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走代理结佣-仅代理", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
}
|
||||
else
|
||||
case (int)GlobalEnumVars.CommissionChannel.仅分销 when openDistribution == 1:
|
||||
{
|
||||
await _distributionOrderServices.AddData(order); //添加分享关联订单日志
|
||||
//判断是否可以成为分销商
|
||||
//先判断是否已经是经销商了。
|
||||
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) //无需审核，但是要满足提交
|
||||
@@ -128,7 +86,7 @@ namespace CoreCms.Net.RedisMQ
|
||||
if (check == false)
|
||||
{
|
||||
await _distributionServices.CheckCondition(allConfigs, info, order.userId);
|
||||
if (info.ConditionStatus == true && info.ConditionProgress == 100)
|
||||
if (info.ConditionStatus && info.ConditionProgress == 100)
|
||||
{
|
||||
//添加用户
|
||||
var user = await _userServices.QueryByClauseAsync(p => p.id == order.userId);
|
||||
@@ -148,17 +106,23 @@ namespace CoreCms.Net.RedisMQ
|
||||
{
|
||||
await _distributionServices.CheckUpdate(order.userId);
|
||||
}
|
||||
jm.status = true;
|
||||
jm.msg = "分销成功";
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走分销结佣-先代理后分销", JsonConvert.SerializeObject(jm));
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走分销结佣-仅分销", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (commissionChannel == (int)GlobalEnumVars.CommissionChannel.先分销后代理)
|
||||
{
|
||||
var jm = await _distributionOrderServices.AddData(order);
|
||||
if (jm.status)
|
||||
case (int)GlobalEnumVars.CommissionChannel.先代理后分销 when openDistribution == 1 && isOpenAgent == 1:
|
||||
{
|
||||
var jm = await _agentOrderServices.AddData(order);
|
||||
|
||||
//判断是走代理还是走分销
|
||||
if (jm.status)
|
||||
{
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走代理结佣-先代理后分销", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
}
|
||||
|
||||
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) //无需审核，但是要满足提交
|
||||
@@ -190,14 +154,54 @@ namespace CoreCms.Net.RedisMQ
|
||||
}
|
||||
jm.status = true;
|
||||
jm.msg = "分销成功";
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走分销结佣-先分销后代理", JsonConvert.SerializeObject(jm));
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走分销结佣-先代理后分销", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
}
|
||||
else
|
||||
case (int)GlobalEnumVars.CommissionChannel.先分销后代理 when openDistribution == 1 && isOpenAgent == 1:
|
||||
{
|
||||
jm = await _agentOrderServices.AddData(order);
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走代理结佣-先分销后代理", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
var jm = await _distributionOrderServices.AddData(order);
|
||||
if (jm.status)
|
||||
{
|
||||
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);
|
||||
if (info.ConditionStatus && info.ConditionProgress == 100)
|
||||
{
|
||||
//添加用户
|
||||
var user = await _userServices.QueryByClauseAsync(p => p.id == order.userId);
|
||||
var iData = new CoreCmsDistribution();
|
||||
iData.userId = order.userId;
|
||||
iData.mobile = user.mobile;
|
||||
iData.name = !string.IsNullOrEmpty(user.nickName) ? user.nickName : user.mobile;
|
||||
iData.verifyStatus = (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes;
|
||||
iData.verifyTime = DateTime.Now;
|
||||
|
||||
await _distributionServices.AddData(iData, order.userId);
|
||||
}
|
||||
}
|
||||
}
|
||||
//已经是经销商的判断是否可以升级
|
||||
if (check)
|
||||
{
|
||||
await _distributionServices.CheckUpdate(order.userId);
|
||||
}
|
||||
jm.status = true;
|
||||
jm.msg = "分销成功";
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走分销结佣-先分销后代理", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
jm = await _agentOrderServices.AddData(order);
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走代理结佣-先分销后代理", JsonConvert.SerializeObject(jm));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user