From 008e5fdbcc6f9ea112b24ce603a392a75b83ff9e Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 16 Oct 2020 10:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Actions/Tools/DataReportTime.php    |  2 -
 app/Admin/Controllers/v3/DataReport.php       | 73 +++++++++++++++----
 app/Admin/Extensions/Chart/Bar/OrderBar.php   |  1 -
 .../admin/tools/data_report_time.blade.php    |  2 +-
 4 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/app/Admin/Actions/Tools/DataReportTime.php b/app/Admin/Actions/Tools/DataReportTime.php
index 25aec8c..52ef553 100644
--- a/app/Admin/Actions/Tools/DataReportTime.php
+++ b/app/Admin/Actions/Tools/DataReportTime.php
@@ -31,7 +31,6 @@ JS;
     public function render()
     {
         $options = [
-            'all'=>'全部',
             'today'   => '今日',
             'yesterday'     => '昨日',
             'week'     => '本周',
@@ -42,7 +41,6 @@ JS;
         ];
 
         $data = [
-            'all'=>'0',
             'today'   => '1',
             'yesterday'     => '-1',
             'week'     => 'w',
diff --git a/app/Admin/Controllers/v3/DataReport.php b/app/Admin/Controllers/v3/DataReport.php
index 412488a..41c23a2 100644
--- a/app/Admin/Controllers/v3/DataReport.php
+++ b/app/Admin/Controllers/v3/DataReport.php
@@ -7,8 +7,10 @@ namespace App\Admin\Controllers\v3;
 
 use App\Admin\Actions\Tools\DataReportDate;
 use App\Admin\Actions\Tools\DataReportOption;
+use App\Admin\Common\Order;
 use App\Admin\Extensions\Chart\Bar\OrderBar;
 use App\Models\LanzuStore;
+use App\Models\v3\User;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Column;
@@ -25,9 +27,37 @@ class DataReport
      * @param Content $content
      * @return Content
      */
-    public function index(Content $content)
+    protected $_amount;
+    protected $_number;
+    protected $_count_user;
+    public function __construct()
     {
+        $option = request()->get('option');
+        $this->_amount = Order::getOrderData([
+            'user_type'=>'market_service',//谁取数据  user_type  用户类型
+            'data_type'=>'amount',//取什么数据    data_type   数据类型
+            'market_id'=>'',//取哪个市场数据
+            'condition'=>1,//取数据维度     condition
+            'user_ids'=>null
+        ],$option);
+        $this->_number = Order::getOrderData([
+            'user_type'=>'market_service',//谁取数据  user_type  用户类型
+            'data_type'=>'number',//取什么数据    data_type   数据类型
+            'market_id'=>'',//取哪个市场数据
+            'condition'=>1,//取数据维度     condition
+            'user_ids'=>null
+        ],$option);
+        $this->_count_user = Order::getOrderData([
+            'user_type'=>'market_service',//谁取数据  user_type  用户类型
+            'data_type'=>'count_user',//取什么数据    data_type   数据类型
+            'market_id'=>'',//取哪个市场数据
+            'condition'=>1,//取数据维度     condition
+            'user_ids'=>null
+        ],$option);
+    }
 
+    public function index(Content $content)
+    {
         return $content
             ->header('数据统计')
             ->body(function (Row $row){
@@ -45,42 +75,47 @@ class DataReport
             })->body('<hr />')
             ->body(function (Row $row){
                 $row->column(2,function (Column $column){
-                    $title = "营业总额(元)";
-                    $value = 0;
+                    $title = "订单总额(元)";
+                    $value = $this->_amount;
                     $card = Card::make("<span style='color: #ffffff'>{$title}</span>","<span style='color: #ffffff'>{$value}</span>");
                     $card->style('background-color:#4e9876');
                     $column->row($card);
                 });
                 $row->column(2,function (Column $column){
-                    $title = "总入账(元)";
-                    $value = 0;
+                    $title = "订单数";
+                    $value = $this->_number;
                     $card = Card::make("<span style='color: #ffffff'>{$title}</span>","<span style='color: #ffffff'>{$value}</span>");
                     $card->style('background-color:#4e9876');
                     $column->row($card);
                 });
-                $row->column(2,function (Column $column){
-                    $title = "商户实际收";
-                    $value = 0;
+                $row->column(2,function (Column $column) {
+                    $title = "下单人数";
+                    $value =$this->_count_user;
                     $card = Card::make("<span style='color: #ffffff'>{$title}</span>","<span style='color: #ffffff'>{$value}</span>");
                     $card->style('background-color:#4e9876');
                     $column->row($card);
                 });
                 $row->column(2,function (Column $column){
-                    $title = "有效订单量";
-                    $value = 0;
+                    $title = "人均单价(元)";
+                    if ($this->_amount){
+                        $value = sprintf("%.2f",$this->_amount/$this->_count_user);
+                    }else{
+                        $value=0;
+                    }
+
                     $card = Card::make("<span style='color: #ffffff'>{$title}</span>","<span style='color: #ffffff'>{$value}</span>");
                     $card->style('background-color:#4e9876');
                     $column->row($card);
                 });
                 $row->column(2,function (Column $column){
-                    $title = "无效订单量";
-                    $value = 0;
+                    $title = "有效用户总数";
+                    $value = User::where('nick_name','!=','')->count();
                     $card = Card::make("<span style='color: #ffffff'>{$title}</span>","<span style='color: #ffffff'>{$value}</span>");
                     $card->style('background-color:#4e9876');
                     $column->row($card);
                 });
                 $row->column(2,function (Column $column){
-                    $title = "佣金收入";
+                    $title = "佣金收入(元)";
                     $value = 0;
                     $card = Card::make("<span style='color: #ffffff'>{$title}</span>","<span style='color: #ffffff'>{$value}</span>");
                     $card->style('background-color:#4e9876');
@@ -109,6 +144,11 @@ class DataReport
             });
     }
 
+    /**
+     * 订单数据
+     * @param array $params
+     * @return array[]|string[]
+     */
     public function orderData($params=[])
     {
         $where['type'] = $params['type'];
@@ -130,4 +170,11 @@ class DataReport
         return ['time'=>'','num'=>'','amount'=>''];
 
     }
+
+
+    public function getOrderData()
+    {
+
+    }
+
 }
diff --git a/app/Admin/Extensions/Chart/Bar/OrderBar.php b/app/Admin/Extensions/Chart/Bar/OrderBar.php
index 097f379..f2b6f52 100644
--- a/app/Admin/Extensions/Chart/Bar/OrderBar.php
+++ b/app/Admin/Extensions/Chart/Bar/OrderBar.php
@@ -11,7 +11,6 @@ class OrderBar extends Chart
     public function __construct($data=[])
     {
         parent::__construct($containerSelector=null, $options=[]);
-        dump($data);
         $this->_data = $data;
         $this->setUpOptions();
     }
diff --git a/resources/views/admin/tools/data_report_time.blade.php b/resources/views/admin/tools/data_report_time.blade.php
index f2dbbcc..2e33c54 100644
--- a/resources/views/admin/tools/data_report_time.blade.php
+++ b/resources/views/admin/tools/data_report_time.blade.php
@@ -1,6 +1,6 @@
 <div class="btn-group btn-group-toggle" data-toggle="buttons">
     @foreach($options as $option => $label)
-        <label class="btn btn-outline-primary {{request()->get('t','all')==$option? 'active':''}}">
+        <label class="btn btn-outline-primary {{request()->get('type','today')==$option? 'active':''}}">
             <input type="radio" name="options" id="{{$option}}"> {{$label}}
         </label>
     @endforeach