Merge branch 'qs_local_order' into develop

# Conflicts:
#	app/Admin/Controllers/HomeController.php

app/Admin/Controllers/AuthController.php

@@ -3,7 +3,6 @@
 namespace App\Admin\Controllers;
 
 use App\Models\AdminUsers;
-use Dcat\Admin\Admin;
 use Dcat\Admin\Controllers\AuthController as BaseAuthController;
 use Illuminate\Http\Request;
 

app/Admin/Controllers/HomeController.php

@@ -11,7 +11,6 @@ use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Admin;
 
 
-
 class HomeController extends Controller
 {
     public function index(Content $content)
@@ -24,6 +23,8 @@ class HomeController extends Controller
             return $this->lanzu_mm($content);
         } elseif (Admin::user()->isRole('lanzu_cs')) {
             return $this->lanzu_cs($content);
+        } elseif (Admin::user()->isRole('market_service')) {
+            return $this->market_service($content);
         }
 
         return $this->default($content);
@@ -74,7 +75,11 @@ class HomeController extends Controller
             ->description('欢迎回到懒族后台')
             ->body(function (Row $row) {
                 $row->column(3, function (Column $column) {
+<<<<<<< .mine
                     $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_MM));
+=======
+                    $column->row(new Examples\Community\TotalAmount(Admin::user()->id, 2));
+>>>>>>> .theirs
                 });
 
                 $row->column(3, function (Column $column) {
@@ -113,9 +118,27 @@ class HomeController extends Controller
                 });
 
                 $row->column(4, function (Column $column) {
+<<<<<<< .mine
                     $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_CS));
+=======
+                    $column->row(new Examples\Community\TotalAmount(Admin::user()->id, 3));
+>>>>>>> .theirs
                 });
             });
     }
 
+    protected function market_service(Content $content)
+    {
+        return $content->header('控制面板')
+            ->description('欢迎回到懒族后台')
+            ->body(function (Row $row) {
+                $row->column(4, function (Column $column) {
+                    $column->row(new Examples\Order\OrderData('number','订单数'));
+                });
+
+                $row->column(4, function (Column $column) {
+                    $column->row(new Examples\Order\OrderData('amount','订单金额'));
+                });
+            });
+    }
 }

app/Admin/Controllers/ImsCjdcOrderMainController.php

@@ -53,11 +53,11 @@ class ImsCjdcOrderMainController extends AdminController
                 ->label([1 => 'dark', 2 => 'danger', 3 => 'indigo', 4 => 'success',8=>'warning']);
             $grid->money;
             $grid->column('market.name', '所属市场');
-            $grid->pay_time('支付时间')->display(function () {
-                return date('Y-m-d H:i:s');
+            $grid->pay_time('支付时间')->display(function ($time) {
+                return date('Y-m-d H:i:s',$time);
             });
-            $grid->created_at('下单时间')->display(function () {
-                return date('Y-m-d H:i:s');
+            $grid->created_at('下单时间')->display(function ($time) {
+                return date('Y-m-d H:i:s',$time);
             });
 
             $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {

app/Admin/Metrics/Examples/Order/OrderData.php

@@ -0,0 +1,120 @@
+<?php
+namespace App\Admin\Metrics\Examples\Order;
+
+
+
+use App\Models\ImsCjdcOrder;
+use App\Models\ImsCjdcOrderMain;
+use Dcat\Admin\Widgets\Metrics\Card;
+use Illuminate\Http\Request;
+
+class OrderData extends Card
+{
+    protected $title;
+    protected $data_type;
+    public function __construct($data_type=null,$title = null, $icon = null)
+    {
+        $this->title = $title;
+        $this->data_type = $data_type;
+        parent::__construct($title, $icon);
+    }
+
+    public function init()
+    {
+        parent::init(); // TODO: Change the autogenerated stub
+        $this->dropdown([
+            '1'=>'今日',
+            '-1'=>'昨日',
+            '7'=>'过去一周',
+            '30'=>'本月',
+            '-30'=>'上月'
+        ]);
+
+    }
+
+    public function handle(Request $request)
+    {
+        $type = $request->get('option');//数据选项
+        $data_type = $request->get('data_type');//数据类型
+        $this->content($this->orderNum($data_type,$type));
+    }
+
+    public function orderDataBuild($marketId=null,$type=null)
+    {
+
+        $where = [];
+        $where['type'] = 1;
+        if ($marketId){
+            $where['market_id'] = $marketId;
+        }
+
+        switch ($type){
+            case '1':
+                $beginTime=mktime(0,0,0,date('m'),date('d'),date('Y'));
+                $endTime=mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1;
+                break;
+            case '-1':
+                $beginTime=mktime(0,0,0,date('m'),date('d')-1,date('Y'));
+                $endTime=mktime(0,0,0,date('m'),date('d'),date('Y'))-1;
+                break;
+            case '7':
+                $beginTime=mktime(0,0,0,date('m'),date('d')-7,date('Y'));
+                $endTime=mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1;
+                break;
+            case '30':
+                $beginTime=mktime(0,0,0,date('m'),1,date('Y'));
+                $endTime=mktime(23,59,59,date('m'),date('t'),date('Y'));
+                break;
+            case '-30':
+                $beginTime=mktime(0,0,0,date('m')-1,1,date('Y'));
+                $endTime=strtotime(date("Y-m-d H:i:s",mktime(23,59,59,date("m") ,0,date("Y"))));
+                break;
+            default:
+                $beginTime=mktime(0,0,0,date('m'),date('d'),date('Y'));
+                $endTime=mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1;
+                break;
+        }
+        $build = ImsCjdcOrderMain
+            ::whereBetween('created_at',[$beginTime,$endTime])
+            ->whereIn('state',[3,4,5,10])
+            ->where($where);
+        return $build;
+    }
+
+
+    public function orderNum($data_type,$type)
+    {
+        $build = $this->orderDataBuild($marketId=null,$type);
+        if ($data_type=='number'){
+            $result = $build->count();
+        }elseif ($data_type=='amount'){
+            $result = $build->sum('money');
+        }else{
+            $result = 0;
+        }
+        return $result;
+    }
+
+
+    // 传递自定义参数到 handle 方法
+    public function parameters() : array
+    {
+        return [
+            'data_type'=>$this->data_type
+        ];
+    }
+
+    /**
+     * 渲染卡片内容
+     * @return string
+     */
+    public function renderContent()
+    {
+        $content = parent::renderContent();
+        return <<<HTML
+<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
+    <h2 class="ml-1 font-large-1">{$content}</h2>
+</div>
+HTML;
+    }
+}

config/market_service.php

@@ -1,5 +1,5 @@
 <?php
 return [
-    'admin_user_id'=>[98,99],
-    'market_id'=>[98=>1,99=>2]
+    'admin_user_id'=>[98,99,100,101],
+    'market_id'=>[98=>1,99=>2,100=>3,101=>4]
 ];