From 9fc86228b280e4fead2a4199bdaa5b6b580a8215 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 23 Oct 2020 17:43:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81--=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v3/GoodsActivityReportController.php      |  4 +--
 .../Repositories/v3/GoodsActivityReport.php   |  2 +-
 .../Charts/OrderGoodsActivityCountChart.php   | 27 ++++++++++---------
 .../Charts/OrderGoodsActivityTotalChart.php   | 16 ++++++-----
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsActivityReportController.php b/app/Admin/Controllers/v3/GoodsActivityReportController.php
index 9c019a6..ead085f 100644
--- a/app/Admin/Controllers/v3/GoodsActivityReportController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityReportController.php
@@ -136,7 +136,7 @@ class GoodsActivityReportController extends AdminController
                 // });
                 $marketData = $this->GoodsActivityReport->getMarketData($this->newParams);
                 $totalData = $this->GoodsActivityReport->getCountData($this->newParams);
-
+                
                 $totalParams = [
                     'list' => $totalData,
                 ];
@@ -144,7 +144,7 @@ class GoodsActivityReportController extends AdminController
                     'list' => $marketData,
                     'markets' => $this->marketList
                 ];
-
+                
                 $row->column(4,new OrderGoodsActivityTotalChart($totalParams));
                 $row->column(4,new OrderGoodsActivityCountChart($totalParams));
                 $row->column(4,new OrderGoodsActivityMarketChart($marketParams));
diff --git a/app/Admin/Repositories/v3/GoodsActivityReport.php b/app/Admin/Repositories/v3/GoodsActivityReport.php
index 859f023..47d1e6f 100644
--- a/app/Admin/Repositories/v3/GoodsActivityReport.php
+++ b/app/Admin/Repositories/v3/GoodsActivityReport.php
@@ -109,7 +109,7 @@ class GoodsActivityReport extends EloquentRepository
     {
         $selects = "SUM(lanzu_order_goods.number) as total,SUM((original_price-price)*number) as subsidy_total,FROM_UNIXTIME(lanzu_order_goods.created_at,'%Y-%m-%d') as dtime"; 
         $orderGoodsActivity = $this->getDataModel($selects,$params);
-        $total = $orderGoodsActivity->groupBy('dtime')->get()->toArray();
+        $total = $orderGoodsActivity->orderBy('dtime','asc')->groupBy('dtime')->get()->toArray();
 
         return $total ?? [];
     }
diff --git a/app/Admin/Widgets/Charts/OrderGoodsActivityCountChart.php b/app/Admin/Widgets/Charts/OrderGoodsActivityCountChart.php
index c3b4a9a..c7e9147 100644
--- a/app/Admin/Widgets/Charts/OrderGoodsActivityCountChart.php
+++ b/app/Admin/Widgets/Charts/OrderGoodsActivityCountChart.php
@@ -18,18 +18,20 @@ class OrderGoodsActivityCountChart extends Line
     protected $data = [];
     protected $total = [];
     protected $valueData = [];
+    protected $chartData = [];
     protected $GoodsActivityReport = null;
     protected $showNumber = 7;
 
     public function __construct($params = [])
     {
         parent::__construct();
-
+        
         $data = $params['list'] ?? [];
-
+        
         if(!empty($data) && is_array($data)){
             $subsidyTotal = 0;
             foreach($data as $key => $value){
+                
                 if($key < $this->showNumber){
                     $this->data[] = $value['subsidy_total'];
                     $this->categories[] = $value['dtime'];
@@ -39,22 +41,13 @@ class OrderGoodsActivityCountChart extends Line
             $this->total['subsidy_total'] = $subsidyTotal;
         }
 
-        $data = $this->data;
-        $categories = $this->categories;
-        $chartData = [
+        $this->chartData = [
             [
                 'name' => '金额',
-                'data' => $data,
+                'data' => $this->data,
             ]
         ];
-        $this->withContent($this->total);
-        $this->withChart($chartData);
-        $this->withCategories($categories);
-    }
 
-    protected function init()
-    {
-        parent::init();
         $color = Admin::color();
         // 设置标题
         $this->title('总补贴金额（元）');
@@ -84,6 +77,14 @@ class OrderGoodsActivityCountChart extends Line
             'xaxis.categories',
             $this->categories
         );
+        $this->withContent($this->total);
+        $this->withChart($this->chartData);
+        $this->withCategories($this->categories);
+    }
+
+    protected function init()
+    {
+        parent::init();
     }
     
     /**
diff --git a/app/Admin/Widgets/Charts/OrderGoodsActivityTotalChart.php b/app/Admin/Widgets/Charts/OrderGoodsActivityTotalChart.php
index 5af62b3..ad664c1 100644
--- a/app/Admin/Widgets/Charts/OrderGoodsActivityTotalChart.php
+++ b/app/Admin/Widgets/Charts/OrderGoodsActivityTotalChart.php
@@ -46,14 +46,7 @@ class OrderGoodsActivityTotalChart extends Bar
                  'data' => $this->data,
              ]
          ];
-         $this->withContent($this->total);
-         $this->withChart($chartData);
-         $this->withCategories($categories);
-    }
 
-    protected function init()
-    {
-        parent::init();
         $color = Admin::color();
         // 设置标题
         $this->title('销售总数量（单）');
@@ -81,6 +74,15 @@ class OrderGoodsActivityTotalChart extends Bar
             'xaxis.categories',
             $this->categories
         );
+
+        $this->withContent($this->total);
+        $this->withChart($chartData);
+        $this->withCategories($categories);
+    }
+
+    protected function init()
+    {
+        parent::init();
     }
     
     /**