调整月销售利润报表，获取管理成本改成获取付现流水销管财的费用

Bailun.DC.MonthSaleProfit/Services.cs

@@ -536,7 +536,7 @@ namespace Bailun.DC.MonthSaleProfit
                 var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?" + "BeginRepayTime=" + day.ToString("yyyy-MM-dd") + "&EndRepayTime=" + day.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
                 var listInterest = new Bailun.DC.Services.FinanceReportServices().ListInterestExpense(cwurl);
                 //管理成本
-                var list = new Bailun.DC.Services.FinanceReportServices().ListFinanceManageCost(day, day.AddMonths(1).AddDays(-1), "", "", "", null);
+                var list = new Bailun.DC.Services.FinanceReportServices().ListFinanceFee(day, day.AddMonths(1).AddDays(-1), "", "", "", null,1);
                 //手续费
                 var listHandleFee = new Bailun.DC.Services.FinanceReportServices().ListFinanceHandleFee(day, day.AddMonths(1).AddDays(-1), 1);
 
@@ -573,7 +573,7 @@ namespace Bailun.DC.MonthSaleProfit
                 m.cost = m.cost_dianzi + m.cost_fuzhuang + m.cost_jiaju + m.cost_jingyou + m.cost_meirongmj+ m.cost_other;
                 
                 
-                //平台费=平台费+paypal费+处理费+广告费+上架费
+                //平台费=平台费+paypal费+处理费
                 m.fee_platform = objOrder.Sum(a => a.cost_platform_fee+a.cost_paypal_fee+a.cost_handle_platform) + objFBA.Sum(a => a.cost_platform_fee);
 
                 //FBA费
@@ -624,7 +624,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
                 var objLogistics = cn.Query<Models.mLogisticsFee>(sql,null,null,true,6*60).ToList();
 
 
-                //物流仓储费用 = 头程运输+直邮物流费（国内发货）+尾程物流费（国外发货）+海外仓仓储+海外仓杂费
+                //物流运输费用 = 头程运输+直邮物流费（国内发货）+尾程物流费（国外发货）+海外仓仓储+海外仓杂费
                 //头程运输费改为从调拨系统读取，预估费用，交运确认时间
                 //var objFirst = cn.QueryFirstOrDefault<decimal>($"select sum(estimatedcost) from dc_base_transfer_info where isdeleted=0 and stateid>1 and deliverytime >='{day.ToString("yyyy-MM-dd")}' and deliverytime<'{day.AddMonths(1).ToString("yyyy-MM-dd")}'");
                 m.fee_logistics_first = objOrder.Sum(a => a.cost_first) + objFBA.Sum(a => a.cost_first);//objFirst; //
@@ -636,7 +636,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
 
 
                 //付现销售费用
-                m.managecost_bl_xg = (list.Where(a => a.company_name.Contains("香港百伦") && a.fee_super_type != "物流费")?.Sum(a => (a.manage_cost_type==2?-a.amount_rmb:a.amount_rmb)) ?? 0);
+                m.managecost_bl_xg = (list.Where(a => a.company_name.Contains("香港百伦") && a.type_name != "物流费")?.Sum(a => (a.cost_form==2?-a.amount_rmb:a.amount_rmb)) ?? 0);
                 m.fee_paycash_sales = 0; //list.Where(a => (a.fee_super_type == "推广费") && !a.company_name.Contains("香港百伦") && !a.company_name.Contains("四千里") && !a.company_name.Contains("YOUNGTOP INTERNATIONAL LIMITED") && !a.company_name.Contains("miles") && !a.company_name.Contains("拉古娜") && !a.company_name.Contains("哈倪蔓"))?.Sum(a => a.amount_rmb) ?? 0;
                 //付现销售费用加上香港百伦的管理成本金额 
                 //Add by Allan at 20210102
@@ -654,13 +654,13 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
 
                 //管理成本=广州百伦+美容美甲店+杨杉+信荟蓝+成品仓+迪致美容
                 
-                m.managecost_bl_gz = (list.Where(a => a.company_name.Contains("广州百伦") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0)+(listHandleFee?.Sum(a=>a.pay_money_rMB)??0);
-                m.managecost_meijia = (list.Where(a => a.company_name.Contains("歌戈儿") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_chengpincang = (list.Where(a => (a.company_name.Contains("广州电子服装仓") || a.company_name.Contains("阳山")) && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_yangshan = (list.Where(a => a.company_name.Contains("扬杉") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_xinhuilan = (list.Where(a => a.company_name.Contains("信荟蓝") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_meijiashengchan = (list.Where(a => a.company_name.Contains("美甲生产仓") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_dizhi = (list.Where(a => a.company_name.Contains("迪致美容") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managecost_bl_gz = (list.Where(a => a.company_name.Contains("广州百伦") && (a.type_name != "推广费" && a.type_name != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0)+(listHandleFee?.Sum(a=>a.pay_money_rMB)??0);
+                m.managecost_meijia = (list.Where(a => a.company_name.Contains("歌戈儿") && (a.type_name != "推广费" && a.type_name != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_chengpincang = (list.Where(a => (a.company_name.Contains("广州电子服装仓") || a.company_name.Contains("阳山")) && (a.type_name != "推广费" && a.type_name != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_yangshan = (list.Where(a => a.company_name.Contains("扬杉") && (a.type_name != "推广费" && a.type_name != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_xinhuilan = (list.Where(a => a.company_name.Contains("信荟蓝") && (a.type_name != "推广费" && a.type_name != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_meijiashengchan = (list.Where(a => a.company_name.Contains("美甲生产仓") && (a.type_name != "推广费" && a.type_name != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_dizhi = (list.Where(a => a.company_name.Contains("迪致美容") && (a.type_name != "推广费" && a.type_name != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
 
                 m.managercost_count = m.managecost_bl_gz + m.managecost_meijia + m.managercost_chengpincang + m.managercost_xinhuilan + m.managercost_yangshan+m.managercost_dizhi;