优化订单卡片数据

app/Admin/Controllers/HomeController.php

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Common\Auth;
 use App\Admin\Common\Type;
 use App\Admin\Metrics\Examples;
 use App\Http\Controllers\Controller;
@@ -131,15 +132,19 @@ class HomeController extends Controller
 
     protected function market_service(Content $content)
     {
+        $marketId = Auth::getMarket();
         return $content->header('控制面板')
             ->description('欢迎回到懒族后台')
-            ->body(function (Row $row) {
-                $row->column(4, function (Column $column) {
-                    $column->row(new Examples\Order\OrderData('number','订单数'));
+            ->body(function (Row $row)use ($marketId) {
+                $row->column(4, function (Column $column)use ($marketId) {
+                    $column->row(new Examples\ServiceCard\TotalStore($marketId,'商户数'));
+                });
+                $row->column(4, function (Column $column)use ($marketId) {
+                    $column->row(new Examples\Order\OrderData('number',$marketId,'订单数'));
                 });
 
-                $row->column(4, function (Column $column) {
-                    $column->row(new Examples\Order\OrderData('amount','订单金额'));
+                $row->column(4, function (Column $column)use ($marketId) {
+                    $column->row(new Examples\Order\OrderData('amount',$marketId,'订单金额(元)'));
                 });
             });
     }

app/Admin/Controllers/ImsCjdcOrderMainController.php

@@ -11,6 +11,8 @@ use App\Admin\Extensions\OrderPrint;
 use App\Admin\Extensions\OrderRefund;
 use App\Admin\Extensions\OrderStateHandle;
 use App\Admin\Repositories\ImsCjdcOrderMain;
+use App\Models\ImsCjdcMarket;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
@@ -37,11 +39,17 @@ class ImsCjdcOrderMainController extends AdminController
             $grid->paginate(10);//每页展示数据10条
             //$grid->id;
             //$grid->user_id('用户信息');
-            $marketId = Auth::getMarket();
-            if ($marketId){
+            if (!(Admin::user()->isRole('market_service'))){
+                $marketId =  \Request::get('market_id');
+                if ($marketId){
+                    $grid->model()->where('market_id',$marketId);
+                }
+            }else{
+                $marketId =Auth::getMarket();
                 $grid->model()->where('market_id',$marketId);
             }
 
+
             $grid->column('nick_name', '用户信息');
             $grid->order_num;
             $grid->state('订单状态')
@@ -76,6 +84,9 @@ class ImsCjdcOrderMainController extends AdminController
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('order_num');
+                if (!(Admin::user()->isRole('market_service'))){
+                    $filter->equal('market_id','所属市场')->select(ImsCjdcMarket::getMarket());
+                }
             });
 
             $grid->disableViewButton();

app/Models/LanzuStore.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 class LanzuStore extends Model
 {
 	use HasDateTimeFormatter;
-    protected $table = 'lanzu_store_new';
+    protected $table = 'lanzu_store';
     protected $dateFormat = 'U';
 
     public $timestamps = false;