diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index aee3e76..2f0150d 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -546,7 +546,7 @@ class StatisticsController extends CommonController // 当月天数 $days = date('t', strtotime($month)); $area = Area::withCount('beds')->where('project_id', $project_id)->get(); - + $total['order_total'] = $total['shouxufei'] = $total['zengshishui'] = $total['shijishouru'] = $total['guanlifei'] = 0; foreach ($area as $item) { $beds = Bed::where('area_id', $item->id)->where('project_id', $project_id)->get(); // 订单总数 @@ -559,6 +559,12 @@ class StatisticsController extends CommonController $item->zengshishui = round($orderTotal * 0.06, 2); $item->shijishouru = round($orderTotal - $item->shouxufei - $item->zengshishui, 2); $item->guanlifei = round($item->shijishouru * 0.06, 2); + // 合计 + $total['order_total'] += $item->order_total; + $total['shouxufei'] += $item->shouxufei; + $total['zengshishui'] += $item->zengshishui; + $total['shijishouru'] += $item->shijishouru; + $total['guanlifei'] += $item->guanlifei; } // 导出 @@ -588,7 +594,7 @@ class StatisticsController extends CommonController $writer->save('php://output'); exit; } - return view($this->bladePath . ".income", compact("area", "project", "project_id", "month", "projects")); + return view($this->bladePath . ".income", compact("total","area", "project", "project_id", "month", "projects")); } } diff --git a/resources/views/admin/statistics/income.blade.php b/resources/views/admin/statistics/income.blade.php index 439bfdf..e4e8997 100755 --- a/resources/views/admin/statistics/income.blade.php +++ b/resources/views/admin/statistics/income.blade.php @@ -49,6 +49,14 @@