Skip to content

M
mall.oytour.com
Commit 8aacfa15 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 208fe131
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
View file @ 8aacfa15
......@@ -327,10 +327,9 @@ namespace Mall.WebApi.Controllers.AppletWeChat
new ExcelColumn(value: "运费收入") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "已收") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "其他收入") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "合计数") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "合计收入") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "采购成本") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "运费支出") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "总返佣金额") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "已返佣金额") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "返佣信息") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
......@@ -399,7 +398,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
datarow.ExcelRows.Add(new ExcelColumn(value: item.FreightMoney) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.AllPrice.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.YSMoney.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: (item.AllPrice+item.YSMoney).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: (item.AllPrice + item.YSMoney).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.CostMoney.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.GoodsFreight.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.FXCommission.ToString("#0.00")) { });
......@@ -440,9 +439,9 @@ namespace Mall.WebApi.Controllers.AppletWeChat
if (list != null && list.Any())
{
decimal GrossProfitRate = 0;
if (list.Count() > 0)
if (list.Count() > 0 && (list.Sum(x => x.AllPrice + x.YFMoney)) > 0)
{
GrossProfitRate = (Math.Round(list.Sum(x => x.GrossProfitRate) / list.Count(), 4, MidpointRounding.AwayFromZero) * 100);
GrossProfitRate = (Math.Round((list.Sum(x => x.GrossProfit) / list.Sum(x => x.AllPrice + x.YFMoney)), 4, MidpointRounding.AwayFromZero) * 100);
}
ExcelDataSource datarow = new ExcelDataSource()
......@@ -460,7 +459,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
datarow.ExcelRows.Add(new ExcelColumn(value: (list.Sum(x => !string.IsNullOrWhiteSpace(x.FreightMoney) ? Convert.ToDecimal(x.FreightMoney) : 0)).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: list.Sum(x => x.AllPrice).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: list.Sum(x => x.YSMoney).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: list.Sum(x => x.AllPrice+x.YFMoney).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: list.Sum(x => x.AllPrice + x.YFMoney).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: list.Sum(x => x.CostMoney).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: list.Sum(x => x.GoodsFreight).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: list.Sum(x => x.FXCommission).ToString("#0.00")) { });
......@@ -572,9 +571,9 @@ namespace Mall.WebApi.Controllers.AppletWeChat
decimal GrossProfitRate = 0;
if (list.Count() > 0)
if (list.Count() > 0 && (list.Sum(x => x.AllPrice + x.YFMoney)) > 0)
{
GrossProfitRate = (Math.Round(list.Sum(x => x.GrossProfitRate) / list.Count(), 4, MidpointRounding.AwayFromZero) * 100);
GrossProfitRate = (Math.Round((list.Sum(x => x.GrossProfit) / list.Sum(x => x.AllPrice + x.YFMoney)), 4, MidpointRounding.AwayFromZero) * 100);
}
var retult = new
{
......@@ -606,7 +605,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
PayMoney = list.Sum(x => x.PayMoney),
GrossProfit = list.Sum(x => x.GrossProfit),
CompanyName = "",
GrossProfitRate ,//毛利率的平均值
GrossProfitRate,//毛利率的平均值
};
......
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