Skip to content

H
huatu_API
Commit 9736f56b authored by liudong1993's avatar liudong1993
Browse files
Options

1 销售提出 可为0

parent d5300df7
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 21 deletions
REBORN.Module.CommissionModule/MergeCommissionModule2.cs
View file @ 9736f56b
...@@ -870,9 +870,10 @@ namespace REBORN.Module.CommissionModule ...@@ -870,9 +870,10 @@ namespace REBORN.Module.CommissionModule
} }
} }
//销售 //销售
if (qitem.SaleRate > 0) if (qitem.SaleRate >= 0)
{ {
if (qitem.SaleRate == Convert.ToDecimal(0.01)) { qitem.SaleRate = 0; } if (qitem.SaleRate == Convert.ToDecimal(0.01)) { qitem.SaleRate = 0; }
if (qitem.SaleRate <= 0) { errMsg += qitem.OrderId + "销售提成比例小于0"; }
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel)); var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = qitem.EnterID ?? 0; smodel.UserId = qitem.EnterID ?? 0;
smodel.Rate = qitem.SaleRate; smodel.Rate = qitem.SaleRate;
...@@ -880,9 +881,6 @@ namespace REBORN.Module.CommissionModule ...@@ -880,9 +881,6 @@ namespace REBORN.Module.CommissionModule
smodel.RoleType = 1; smodel.RoleType = 1;
DetailList.Add(smodel); DetailList.Add(smodel);
} }
else {
if (qitem.SaleRate <= 0) { errMsg += qitem.OrderId + "销售提成比例小于0"; }
}
//负责人 //负责人
if (qitem.ManagerRate > 0 && qitem.ManagerId>0) { if (qitem.ManagerRate > 0 && qitem.ManagerId>0) {
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel)); var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
...@@ -1041,9 +1039,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1041,9 +1039,10 @@ namespace REBORN.Module.CommissionModule
} }
} }
//销售 //销售
if (item.SaleRate > 0) if (item.SaleRate >= 0)
{ {
if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; } if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单签证销售提成比例小于0"; }
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel)); var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.CreateBy ?? 0; smodel.UserId = item.CreateBy ?? 0;
smodel.Rate = item.SaleRate; smodel.Rate = item.SaleRate;
...@@ -1051,9 +1050,6 @@ namespace REBORN.Module.CommissionModule ...@@ -1051,9 +1050,6 @@ namespace REBORN.Module.CommissionModule
smodel.RoleType = 1; smodel.RoleType = 1;
DetailList.Add(smodel); DetailList.Add(smodel);
} }
else {
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单签证销售提成比例小于0"; }
}
//OP //OP
foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0)) foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0))
{ {
...@@ -1191,9 +1187,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1191,9 +1187,10 @@ namespace REBORN.Module.CommissionModule
} }
} }
//销售 //销售
if (item.SaleRate > 0) if (item.SaleRate >= 0)
{ {
if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; } if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单酒店销售提成比例小于0"; }
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel)); var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.EnterID; smodel.UserId = item.EnterID;
smodel.Rate = item.SaleRate; smodel.Rate = item.SaleRate;
...@@ -1201,9 +1198,6 @@ namespace REBORN.Module.CommissionModule ...@@ -1201,9 +1198,6 @@ namespace REBORN.Module.CommissionModule
smodel.RoleType = 1; smodel.RoleType = 1;
DetailList.Add(smodel); DetailList.Add(smodel);
} }
else {
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单酒店销售提成比例小于0"; }
}
//OP //OP
foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0)) foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0))
{ {
...@@ -1415,9 +1409,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1415,9 +1409,10 @@ namespace REBORN.Module.CommissionModule
} }
} }
//销售 //销售
if (item.SaleRate > 0) if (item.SaleRate >= 0)
{ {
if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; } if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单船票销售提成比例小于0"; }
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel)); var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.EnterID; smodel.UserId = item.EnterID;
smodel.Rate = item.SaleRate; smodel.Rate = item.SaleRate;
...@@ -1425,9 +1420,6 @@ namespace REBORN.Module.CommissionModule ...@@ -1425,9 +1420,6 @@ namespace REBORN.Module.CommissionModule
smodel.RoleType = 1; smodel.RoleType = 1;
DetailList.Add(smodel); DetailList.Add(smodel);
} }
else {
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单船票销售提成比例小于0"; }
}
//OP //OP
foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0)) foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0))
{ {
...@@ -1556,9 +1548,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1556,9 +1548,10 @@ namespace REBORN.Module.CommissionModule
} }
} }
//销售 //销售
if (item.SaleRate > 0) if (item.SaleRate >= 0)
{ {
if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; } if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单签证销售提成比例小于0"; }
var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel)); var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
smodel.UserId = item.CreateBy; smodel.UserId = item.CreateBy;
smodel.Rate = item.SaleRate; smodel.Rate = item.SaleRate;
...@@ -1566,10 +1559,6 @@ namespace REBORN.Module.CommissionModule ...@@ -1566,10 +1559,6 @@ namespace REBORN.Module.CommissionModule
smodel.RoleType = 1; smodel.RoleType = 1;
DetailList.Add(smodel); DetailList.Add(smodel);
} }
else
{
if (item.SaleRate <= 0) { errMsg += item.OrderId + "单签证销售提成比例小于0"; }
}
//OP //OP
foreach (var citem in item.AppointOPList.Where(x => x.OPType == 0)) 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