更新

app/Models/OrderInfo.php

@@ -44,7 +44,7 @@ public function merchant()
      */
     public static function getNumData($started = '', $ended = '', $status = [], $merchant_id = 0)
     {
-        $where = [];
+        $where = ['pay_status' => 1];
         $sqlObj = new self();
         if ($merchant_id) {
             $where['merchant_id'] = $merchant_id;

app/Store/Controllers/HomeController.php

@@ -20,11 +20,6 @@ public function index(Content $content)
             ->header('主页')
             ->description('数据总览')
             ->body(function (Row $row) {
-                // $row->column(6, function (Column $column) {
-                //     // $row->column(6, new Examples\NewUsers());
-                //     // $row->column(6, new Examples\GoodsTotal());
-                //     $column->row(new Examples\Revenue());
-                // });
                 $day = date("d");
 
                 $row->column(12, function (Column $column) {

app/Store/Metrics/Examples/LastPickupTotal.php

@@ -45,7 +45,7 @@ public function handle(Request $request)
                 $started = date('Y-m-01', strtotime('last month'));
                 $ended = date('Y-m-t', strtotime('last month'));
                 $order_status = [3, 4];
-                $count = OrderInfoModel::getNumData($started, $ended, $order_status, Admin::user()->id);
+                $count = OrderInfoModel::getNumData($started, $ended, $order_status, Admin::user()->merchant_id);
                 // 卡片内容
 
                 $this->withContent($count);

app/Store/Metrics/Examples/LastProductOrders.php

@@ -50,7 +50,7 @@ public function handle(Request $request)
                 //上月
                 $started = date('Y-m-01', strtotime('last month'));
                 $ended = date('Y-m-t', strtotime('last month'));
-                $count = OrderInfoModel::getNumData($started, $ended, [2], Admin::user()->id);
+                $count = OrderInfoModel::getNumData($started, $ended, [], Admin::user()->merchant_id);
                 // 卡片内容
                 $this->withContent($count);
                 // 图表数据

app/Store/Metrics/Examples/LastStockTotal.php

@@ -43,7 +43,7 @@ public function handle(Request $request)
             case '30':
             case '7':
             default:
-                $mer_id = Admin::user()->id;
+                $mer_id = Admin::user()->merchant_id;
                 $firstDayOfMonth = date('Y-m-01 00:00:00', strtotime('-1 month', time()));
                 $lastDayOfMonth = date('Y-m-t 23:59:59', strtotime('-1 month', time()));
                 $currentStock = MerchantGoodSku::where("merchant_id", $mer_id)->sum('stock');

app/Store/Metrics/Examples/PickupTotal.php

@@ -55,7 +55,7 @@ public function handle(Request $request)
                 $started = date("Y-m-01");
                 $ended = date("Y-m-t");
                 $order_status = [3, 4];
-                $count = OrderInfoModel::getNumData($started, $ended, $order_status, Admin::user()->id);
+                $count = OrderInfoModel::getNumData($started, $ended, $order_status, Admin::user()->merchant_id);
                 // 卡片内容
 
                 $this->withContent($count);

app/Store/Metrics/Examples/ProductOrders.php

@@ -50,7 +50,7 @@ public function handle(Request $request)
                 //本月
                 $started = date("Y-m-01");
                 $ended = date("Y-m-t");
-                $count = OrderInfoModel::getNumData($started, $ended, [2], Admin::user()->id);
+                $count = OrderInfoModel::getNumData($started, $ended, [], Admin::user()->merchant_id);
                 // 卡片内容
                 $this->withContent($count);
                 // 图表数据

app/Store/Metrics/Examples/StockTotal.php

@@ -42,7 +42,7 @@ public function handle(Request $request)
             case '30':
             case '7':
             default:
-                $mer_id = Admin::user()->id;
+                $mer_id = Admin::user()->merchant_id;
                 $currentStock = MerchantGoodSku::where("merchant_id", $mer_id)->sum('stock');
                 // 卡片内容
                 $this->withContent($currentStock);

app/Store/Metrics/Examples/WaitPickTotal.php

@@ -54,7 +54,7 @@ public function handle(Request $request)
                 $started = date("Y-m-01");
                 $ended = date("Y-m-t");
                 $order_status = [2];
-                $count = OrderInfoModel::getNumData($started, $ended, $order_status, Admin::user()->id);
+                $count = OrderInfoModel::getNumData($started, $ended, $order_status, Admin::user()->merchant_id);
                 // 卡片内容
 
                 $this->withContent($count);