Skip to content

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

1

parent c0563696
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 6 deletions
REBORN.Module.CommissionModule/MergeCommissionModule2.cs
View file @ dda17301
...@@ -1614,7 +1614,7 @@ namespace REBORN.Module.CommissionModule ...@@ -1614,7 +1614,7 @@ namespace REBORN.Module.CommissionModule
HTCProfit = reportList.Any() ? reportList.Sum(x => (x.ShiJiLiRun ?? 0) + (x.TiCheng ?? 0) - (x.YongJinShouRu ?? 0) - x.LeaderPeopleMoney + x.EuropeShareProfit - (x.ZiFei ?? 0)) : 0; HTCProfit = reportList.Any() ? reportList.Sum(x => (x.ShiJiLiRun ?? 0) + (x.TiCheng ?? 0) - (x.YongJinShouRu ?? 0) - x.LeaderPeopleMoney + x.EuropeShareProfit - (x.ZiFei ?? 0)) : 0;
} }
//查询该订单的利润 //查询该订单的利润
if (hisOrder.TCProfit != HTCProfit) if (hisOrder.TCProfit != HTCProfit && HTCProfit>0)
{ {
if (hisOrder.PeopleNum <= 0) if (hisOrder.PeopleNum <= 0)
{ {
...@@ -1702,7 +1702,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1702,7 +1702,10 @@ namespace REBORN.Module.CommissionModule
udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero); udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】"; udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】";
udmodel.Periods = month; udmodel.Periods = month;
DetailList.Add(udmodel); if (udmodel.CommissionMoney != 0 && udmodel.TCProfit >0)
{
DetailList.Add(udmodel);
}
} }
} }
} }
...@@ -1738,7 +1741,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1738,7 +1741,10 @@ namespace REBORN.Module.CommissionModule
udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero); udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】"; udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】";
udmodel.Periods = month; udmodel.Periods = month;
DetailList.Add(udmodel); if (udmodel.CommissionMoney != 0 && udmodel.TCProfit > 0)
{
DetailList.Add(udmodel);
}
} }
} }
} }
...@@ -1771,7 +1777,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1771,7 +1777,10 @@ namespace REBORN.Module.CommissionModule
udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero); udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
udmodel.Description = $"订单利润变动：由【{hisOrder.OrderProfit}】变更为【{newOrder.Income - newOrder.Refund - newOrder.CostMoney}】"; udmodel.Description = $"订单利润变动：由【{hisOrder.OrderProfit}】变更为【{newOrder.Income - newOrder.Refund - newOrder.CostMoney}】";
udmodel.Periods = month; udmodel.Periods = month;
DetailList.Add(udmodel); if (udmodel.CommissionMoney != 0 && udmodel.OrderProfit > 0)
{
DetailList.Add(udmodel);
}
} }
} }
} }
...@@ -1807,7 +1816,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1807,7 +1816,10 @@ namespace REBORN.Module.CommissionModule
udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero); udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】"; udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】";
udmodel.Periods = month; udmodel.Periods = month;
DetailList.Add(udmodel); if (udmodel.CommissionMoney != 0 && udmodel.TCProfit > 0)
{
DetailList.Add(udmodel);
}
} }
} }
} }
...@@ -1843,7 +1855,10 @@ namespace REBORN.Module.CommissionModule ...@@ -1843,7 +1855,10 @@ namespace REBORN.Module.CommissionModule
udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero); udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】"; udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】";
udmodel.Periods = month; udmodel.Periods = month;
DetailList.Add(udmodel); if (udmodel.CommissionMoney != 0 && udmodel.TCProfit > 0)
{
DetailList.Add(udmodel);
}
} }
} }
} }
......
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