Skip to content

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

1

parent ff5127fc
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
REBORN.Module.CommissionModule/MergeCommissionModule.cs
View file @ 947b46bd
......@@ -388,9 +388,9 @@ namespace REBORN.Module.CommissionModule
if (demodel.OutBranchId >= 0)
{
//查询对应公司的提成金额
dlist = b2BSale_Commission_DetailsRepository.GetBranchCommissionList(periodsIds, demodel.OutBranchId, demodel.RB_Group_Id);
dlist = b2BSale_Commission_DetailsRepository.GetBranchCommissionList(periodsIds, demodel.OutBranchId, demodel.RB_Group_Id, demodel.BranchType);
elist = b2BSale_Commission_EmpRepository.GetBranchWageList(periodsIds, demodel.OutBranchId, demodel.RB_Group_Id);
elist = b2BSale_Commission_EmpRepository.GetBranchWageList(periodsIds, demodel.OutBranchId, demodel.RB_Group_Id, BranchType: demodel.BranchType);
if (demodel.OutBranchId == 0)
{
//成都 加上 网络印象的
......@@ -432,7 +432,13 @@ namespace REBORN.Module.CommissionModule
item.WageFinanceMoney = f2list.Where(x => x.ReFinanceId == item.Id).Sum(x => x.WBMoney ?? 0);
}
item.BranchCommission = dlist.Where(x => x.PeriodId == item.Id).FirstOrDefault()?.CommissionMoney ?? 0;
if (demodel.OutBranchId > 0)
{
item.BranchCommission = dlist.Where(x => x.PeriodId == item.Id).FirstOrDefault()?.CommissionMoney ?? 0;
}
else {
item.BranchCommission = item.SumPrice;
}
item.BranchWage = elist.Where(x => x.PeriodId == item.Id).FirstOrDefault()?.PeopleMoney ?? 0;
if (demodel.OutBranchId == 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