提交代码

Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs

@@ -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,//毛利率的平均值
             };