Commit 288720c6 authored by liudong1993's avatar liudong1993

1

parent 707992e7
......@@ -1044,6 +1044,21 @@ namespace REBORN.Module.CommissionModule
if (item.SaleRate >= 0)
{
if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
#region 识别 是否 走负责人模式
if (item.SaleRate ==0 && (ruleOrderModel?.SaleRate ?? 0) == 0 && (ruleOrderModel?.ManagerRate ?? 0) > 0)
{
//识别为 走负责人提成模式
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.CreateBy ?? 0;
smodel.OrderRate = 100 - smodel.OrderRate;
smodel.Rate = (ruleOrderModel?.ManagerRate ?? 0);
smodel.OrderProfit = (smodel.TCProfit - smodel.OrderProfit);
smodel.CommissionMoney = Math.Round(smodel.OrderProfit * smodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
smodel.RoleType = 1;
DetailList.Add(smodel);
}
else {
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单签证销售提成比例小于0"; }
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.CreateBy ?? 0;
......@@ -1052,6 +1067,8 @@ namespace REBORN.Module.CommissionModule
smodel.RoleType = 1;
DetailList.Add(smodel);
}
#endregion
}
//OP
foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0))
{
......@@ -1192,6 +1209,22 @@ namespace REBORN.Module.CommissionModule
if (item.SaleRate >= 0)
{
if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
#region 识别 是否 走负责人模式
if (item.SaleRate == 0 && (ruleOrderModel?.SaleRate ?? 0) == 0 && (ruleOrderModel?.ManagerRate ?? 0) > 0)
{
//识别为 走负责人提成模式
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.EnterID;
smodel.OrderRate = 100 - smodel.OrderRate;
smodel.Rate = (ruleOrderModel?.ManagerRate ?? 0);
smodel.OrderProfit = (smodel.TCProfit - smodel.OrderProfit);
smodel.CommissionMoney = Math.Round(smodel.OrderProfit * smodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
smodel.RoleType = 1;
DetailList.Add(smodel);
}
else
{
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单酒店销售提成比例小于0"; }
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.EnterID;
......@@ -1200,6 +1233,9 @@ namespace REBORN.Module.CommissionModule
smodel.RoleType = 1;
DetailList.Add(smodel);
}
#endregion
}
//OP
foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0))
{
......@@ -1476,10 +1512,13 @@ namespace REBORN.Module.CommissionModule
//首先验证此单是否已经存在了 已经存在就没法
var ExistList = b2BSale_Commission_DetailsRepository.GetList(new RB_B2BSale_Commission_Details_Extend() { RB_Group_Id = userInfo.RB_Group_id, OrderId = item.OrderId, OrderType = Common.Enum.Dmc.CRMMergeOrderTypeEnum.Air, OutBranchId = -1 });
if (ExistList.Any())
{
if (!",44327,44342,44355,".Contains("," + item.OrderId + ","))//这几单 徐晨得 回扣了提成
{
//已经发放了 走利润变更的
continue;
}
}
bool IsUnBanble = false;
if (item.Money != item.IncomeMoney + item.TaxMoney + item.PlatformMoney - item.BackMoney)
{
......@@ -1553,6 +1592,22 @@ namespace REBORN.Module.CommissionModule
if (item.SaleRate >= 0)
{
if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
#region 识别 是否 走负责人模式
if (item.SaleRate == 0 && (ruleOrderModel?.SaleRate ?? 0) == 0 && (ruleOrderModel?.ManagerRate ?? 0) > 0)
{
//识别为 走负责人提成模式
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.CreateBy;
smodel.OrderRate = 100 - smodel.OrderRate;
smodel.Rate = (ruleOrderModel?.ManagerRate ?? 0);
smodel.OrderProfit = (smodel.TCProfit - smodel.OrderProfit);
smodel.CommissionMoney = Math.Round(smodel.OrderProfit * smodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
smodel.RoleType = 1;
DetailList.Add(smodel);
}
else
{
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单签证销售提成比例小于0"; }
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.CreateBy;
......@@ -1561,6 +1616,8 @@ namespace REBORN.Module.CommissionModule
smodel.RoleType = 1;
DetailList.Add(smodel);
}
#endregion
}
//OP
foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment