后台订单统计

app/Admin/Controllers/Chart/OrderChart.php

@@ -81,7 +81,9 @@ class OrderChart
     {
 
         //type 1默认选择当前月份 2根据时间+
-        $month >10??$month = '0'.$month;
+        if(intval($month) < 10){
+           $month  = '0'.$month;
+        }
 
         if($type == 1){
             //查找天
@@ -115,7 +117,7 @@ class OrderChart
             $data = Order::query()
                 ->selectRaw('DATE_FORMAT(created_at,"%m-%d") as day')
                 ->selectRaw('COUNT(*) as count')
-                ->where('created_at', '>', $year.'-'.$month)
+                ->where('created_at', '>=', $year.'-'.$month)
                 ->where('created_at', '<', $year.'-'.($month+1))
                 ->groupBy('day')
                 ->get()->toArray();

app/Admin/Controllers/HomeController.php

@@ -25,43 +25,43 @@ class HomeController extends Controller
             ->row(function (Row $row) {
                 // 产品类型(1.电话咨询 2.图文咨询 3.门诊预约 4.疫苗接种预约 5.儿保预约 6.服务包 7.充值)
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('新增电话咨询订单', 'dropbox', '/admin/deliver?status=1', 'green', Sta::getOrderCount(1)));
+                    $column->append(infoBox('新增电话咨询订单', 'dropbox', '/admin/consulting_orders?product_type=1', 'green', Sta::getOrderCount(1)));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('新增图文咨询订单', 'dropbox', '/admin/deliver?status=1', 'green', Sta::getOrderCount(2)));
+                    $column->append(\App\Admin\Controllers\infoBox('新增图文咨询订单', 'dropbox', '/admin/consulting_orders?product_type=2', 'green', Sta::getOrderCount(2)));
                 });
 
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('新增门诊预约订单', 'user-plus', '/admin/withdraw?status=0', 'green',Sta::getOrderCount(3)));
+                    $column->append(infoBox('新增门诊预约订单', 'user-plus', '/admin/booking_order?product_type=3', 'green',Sta::getOrderCount(3)));
                 });
 
                 $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('新增计免预约订单', 'user-plus', '/admin/withdraw?status=0', 'green', Sta::getOrderCount(4)));
+                    $column->append(\App\Admin\Controllers\infoBox('新增计免预约订单', 'user-plus', '/admin/booking_order?product_type=4', 'green', Sta::getOrderCount(4)));
                 });
             })
             ->row(function (Row $row) {
                 //产品类型(1.电话咨询 2.图文咨询 3.门诊预约 4.疫苗接种预约 5.儿保预约 6.服务包 7.充值)
                 $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('新增儿保订单', 'dropbox', '/admin/deliver?status=1', 'green', Sta::getOrderCount(5)));
+                    $column->append(\App\Admin\Controllers\infoBox('新增儿保订单', 'dropbox', '/admin/booking_order?product_type=5', 'green', Sta::getOrderCount(5)));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('历史总订单', 'dropbox', '/admin/deliver?status=1', 'green', Sta::getOrderCount(0)));
+                    $column->append(\App\Admin\Controllers\infoBox('历史总订单', 'dropbox', 'javascript:void(0)', 'green', Sta::getOrderCount(0)));
                 });
             })
             ->row('<h1 text-align="center">订单走势</h1>')
             ->row(function (Row $row) {
                 //产品类型(1.电话咨询 2.图文咨询 3.门诊预约 4.疫苗接种预约 5.儿保预约 6.服务包 7.充值)
                 $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('今日订单', 'dropbox', '/admin/deliver?status=1', 'green', Sta::getOrderCount(7,1)));
+                    $column->append(\App\Admin\Controllers\infoBox('今日订单', 'dropbox', 'javascript:void(0)', 'green', Sta::getOrderCount(7,1)));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('昨日订单', 'dropbox', '/admin/deliver?status=1', 'green', Sta::getOrderCount(7,-1)));
+                    $column->append(\App\Admin\Controllers\infoBox('昨日订单', 'dropbox', 'javascript:void(0)', 'green', Sta::getOrderCount(7,-1)));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('进七日订单', 'dropbox', '/admin/deliver?status=1', 'green', Sta::getOrderCount(7,7)));
+                    $column->append(\App\Admin\Controllers\infoBox('进七日订单', 'dropbox', 'javascript:void(0)', 'green', Sta::getOrderCount(7,7)));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('近三十日订单', 'dropbox', '/admin/deliver?status=1', 'green', Sta::getOrderCount(7,30)));
+                    $column->append(\App\Admin\Controllers\infoBox('近三十日订单', 'dropbox', 'javascript:void(0)', 'green', Sta::getOrderCount(7,30)));
                 });
 //                1=>'今日订单总数(单)',
 //                        1=>'昨日订单总数(单)',