普通商品--统计报表

app/Admin/Actions/Exporter/GoodsSales.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Admin\Actions\Exporter;
+
+use Maatwebsite\Excel\Concerns\FromArray;
+use Maatwebsite\Excel\Concerns\WithStrictNullComparison;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use App\Admin\Repositories\v3\GoodsReport;
+use App\Models\v3\Market as MarketModel;
+use App\Models\v3\Store as StoreModel;
+use App\Models\LanzuOrderGoods as OrderGoodsModel;
+use App\Models\ImsCjdcOrderMain as OrderMainModel;
+use App\Models\ImsCjdcOrder as OrderModel;
+
+class GoodsSales implements FromArray, WithStrictNullComparison, ShouldAutoSize
+{
+    protected $params = [];
+    public function __construct($params)
+    {
+        $this->params = $params;
+    }
+
+    public function array(): array
+    {
+        $result = [[
+            '下单时间',
+            '主订单号',
+            '商品ID',
+            '商品名称',
+            '市场',
+            '店铺',
+            '售价(元)',
+            '原价(元)',
+            '数量',
+            '单位',
+            '规格',
+            
+        ]];
+        $data = $this->getData($this->params);
+        $markets = MarketModel::getMarketArray();
+        $stores = StoreModel::getStoreArray();
+        foreach ($data as $value){
+            $specStr = '';
+            if(!empty($value['spec'])){
+                $specArr = json_decode($value['spec'],true);
+                if(isset($specArr[0]['spec_key'])){
+                    foreach($specArr as $spec){
+                        $specStr .= ' ['.$spec['spec_key'].'：'.$spec['spec_value'].'] ';
+                    }
+                }
+            }
+            $global_order_id = $value['global_order_id']??'';
+            $item = [
+                date('Y-m_d H:i:s',$value['created_at']),
+                ' '.$global_order_id,
+                $value['goods_id'],
+                $value['name']??'',
+                $markets[$value['market_id']]??'',
+                $stores[$value['store_id']]??'',
+                $value['price']??0,
+                $value['original_price']??0,
+                $value['number']??0,
+                $value['goods_unit']??'',
+                $specStr??''
+            ];
+            
+            $result[] = $item;
+        }
+        return $result;
+    }
+
+    /**
+     * 获取数据
+     */
+    public function getData($option = [])
+    {
+        $params = $option;
+        $repository = new GoodsReport();
+        $selects = OrderGoodsModel::$tableName.'.goods_id,'.OrderGoodsModel::$tableName.'.name,price,original_price,goods_unit,spec,'.OrderMainModel::$tableName.'.market_id,'.OrderModel::$tableName.'.store_id,number,'.OrderMainModel::$tableName.'.created_at,global_order_id';
+        $orderGoods = $repository->getDataModel($selects,$params);
+        $list = $orderGoods->get()->toArray();
+        
+        return $list;
+    }
+
+}

app/Admin/Actions/Tools/GoodsReportExport.php

@@ -56,7 +56,6 @@ class GoodsReportExport extends AbstractTool
     public function parameters()
     {
         return [
-            'page' => request()->input('page', 1),
             'name'   => request()->input('name', ''),
             'market_id' => request()->input('market_id',0),
             'store_id' => request()->input('store_id',0),

app/Admin/Controllers/v3/GoodsReportController.php

@@ -13,8 +13,6 @@ use App\Models\v3\Market as MarketModel;
 use App\Models\v3\Store as StoreModel;
 
 use Dcat\Admin\Grid\Filter;
-use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Layout\Row;
 
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
@@ -37,8 +35,19 @@ class GoodsReportController extends AdminController
      */
     protected function grid()
     {
-        
-        return Grid::make(new GoodsReport(), function (Grid $grid) {
+         $this->marketId = Auth::getMarket();
+
+        if($this->marketId){
+            $this->newParams = ['market_id'=>$this->marketId];
+            $builder = new GoodsReport($this->newParams);
+            $this->marketList = MarketModel::getMarketArray([['id','=',$this->marketId]]);
+            $this->storeList = StoreModel::getStoreArray([['market_id','=',$this->marketId]]);
+        }else{
+            $builder = new GoodsReport();
+            $this->marketList = MarketModel::getMarketArray();
+            $this->storeList = StoreModel::getStoreArray();
+        }
+        return Grid::make($builder, function (Grid $grid) {
             $marketList = $this->marketList;
             $storeList = $this->storeList;
             $grid->column('goods_id')->sortable();
@@ -55,18 +64,22 @@ class GoodsReportController extends AdminController
             })->width('12%');
             $grid->column('price');
             $grid->column('original_price');
-            $grid->column('total','销量');
+            $grid->column('number');
+            $grid->column('created_at')->display(function($createdAt){
+                return date('Y-m-d H:I:s',$createdAt) ?? '';
+            });
+            $grid->column('global_order_id')->help('统计订单状态为已完成的商品');
 
             $grid->filter(function (Filter $filter) use($marketList,$storeList) {
                 // 更改为 panel 布局
                 $filter->panel();
                 $filter->equal('start_time','开始时间')->date()->width(2);
                 $filter->equal('end_time','结束时间')->date()->width(2);
-                $filter->equal('name','商品名称')->width(3);
+                $filter->equal('name','商品名称')->width(2);
                 if(!$this->marketId){
                     $filter->equal('market_id','市场')->select($marketList)->width(2);
                 }
-                $filter->equal('store_id','店铺')->select($storeList)->width(3);
+                $filter->equal('store_id','店铺')->select($storeList)->width(2);
             });
 
             $grid->tools([
@@ -105,7 +118,6 @@ class GoodsReportController extends AdminController
     {
         $this->marketId = Auth::getMarket();
         $params = [
-            'page' => request()->input('page', 1),
             'name'   => request()->input('name', ''),
             'market_id' => $this->marketId ? $this->marketId : request()->input('market_id',0),
             'store_id' => request()->input('store_id',0),
@@ -114,7 +126,7 @@ class GoodsReportController extends AdminController
         ];
 
         $name = date('Y-m-d-His',time());
-        $data = new \App\Admin\Actions\Exporter\GoodsActivitySales($params);
+        $data = new \App\Admin\Actions\Exporter\GoodsSales($params);
         if(empty($data)){
             return $this->error('没有数据！');
         }

app/Admin/Repositories/v3/GoodsActivityReport.php

@@ -6,6 +6,8 @@ use App\Models\LanzuOrderGoods as Model;
 use Dcat\Admin\Grid\Model as GridModel;
 use Dcat\Admin\Repositories\EloquentRepository;
 use Illuminate\Support\Facades\DB;
+use App\Models\ImsCjdcOrderMain as OrderMainModel;
+use App\Models\ImsCjdcOrder as OrderModel;
 
 class GoodsActivityReport extends EloquentRepository
 {
@@ -37,9 +39,9 @@ class GoodsActivityReport extends EloquentRepository
             $where = ['market_id'=>$this->params['market_id']];
         }
        
-        $selects = 'SUM(number) as total,SUM((original_price-price)*number) as subsidy_total,price,original_price,lanzu_order_goods.goods_id,lanzu_order_goods.name,lanzu_order_goods.cover_img,lanzu_order_main.market_id,lanzu_order.store_id';
+        $selects = 'SUM(number) as total,SUM((original_price-price)*number) as subsidy_total,price,original_price,'.Model::$tableName.'.goods_id,'.Model::$tableName.'.name,'.Model::$tableName.'.cover_img,'.OrderMainModel::$tableName.'.market_id,'.OrderModel::$tableName.'.store_id';
         $orderGoodsActivity = $this->getDataModel($selects,$where);
-        $list = $orderGoodsActivity->orderBy('total','desc')->groupBy('goods_id','lanzu_order_goods.name','cover_img','market_id','store_id','price','original_price')->paginate($perPage);
+        $list = $orderGoodsActivity->orderBy('total','desc')->groupBy('goods_id',Model::$tableName.'.name','cover_img','market_id','store_id','price','original_price')->paginate($perPage);
         $list = $list->toArray(); 
 
         return $model->makePaginator(
@@ -60,14 +62,14 @@ class GoodsActivityReport extends EloquentRepository
         $endTime = $params['end_time'] ?? request()->input('end_time','');
 
         $orderGoodsActivity = Model::select(DB::raw($selects))
-            ->join('lanzu_order','lanzu_order_goods.order_id','=','lanzu_order.id')
-            ->join('lanzu_order_main','lanzu_order.order_main_id','=','lanzu_order_main.global_order_id')
-            ->where('lanzu_order_goods.activity_type',2)
-            ->where('lanzu_order_goods.status',1)
-            ->whereIn('lanzu_order_main.state',[4,5,10,11]);
+            ->join(OrderModel::$tableName,Model::$tableName.'.order_id','=',OrderModel::$tableName.'.id')
+            ->join(OrderMainModel::$tableName,OrderModel::$tableName.'.order_main_id','=',OrderMainModel::$tableName.'.global_order_id')
+            ->where(Model::$tableName.'.activity_type',2)
+            ->where(Model::$tableName.'.status',1)
+            ->whereIn(OrderMainModel::$tableName.'.state',[4,5,10,11]);
 
         if($name){
-            $orderGoodsActivity->where('lanzu_order_goods.name','like',"%$name%"); 
+            $orderGoodsActivity->where(Model::$tableName.'.name','like',"%$name%"); 
         }
         if($marketId){
             $orderGoodsActivity->where('market_id',$marketId); 
@@ -76,28 +78,15 @@ class GoodsActivityReport extends EloquentRepository
             $orderGoodsActivity->where('store_id',$storeId); 
         }
         if($startTime){
-            $date = $startTime;
             $startTime = $startTime.' 00:00:00';
             
-            $orderGoodsActivity->where('lanzu_order_goods.created_at','>=',strtotime($startTime));
-        }else{
-            $date = '2020-06-01';
+            $orderGoodsActivity->where(Model::$tableName.'.created_at','>=',strtotime($startTime));
         }
         if($endTime){
-            $date = $date.' 至 '.$endTime;
             $endTime = $endTime.' 23:59:59';
             
-            $orderGoodsActivity->where('lanzu_order_goods.created_at','<=',strtotime($endTime));
-        }else{
-            $date .= ' 至 '.$time;
+            $orderGoodsActivity->where(Model::$tableName.'.created_at','<=',strtotime($endTime));
         }
-        // if(empty($startTime) && empty($endTime)){
-        //     $date = $time;
-        //     $todayStart = $time.' 00:00:00';
-        //     $todayEnd = $time.' 23:59:59';
-        //     $orderGoodsActivity->where([['lanzu_order_goods.created_at','>=',strtotime($todayStart)]]);
-        //     $orderGoodsActivity->where([['lanzu_order_goods.created_at','<=',strtotime($todayEnd)]]);
-        // }
            
         return $orderGoodsActivity;
     }
@@ -107,9 +96,9 @@ class GoodsActivityReport extends EloquentRepository
      */
     public function getCountData($params = [])
     {
-        $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"; 
+        $selects = "SUM(".Model::$tableName.".number) as total,SUM((original_price-price)*number) as subsidy_total,FROM_UNIXTIME(".Model::$tableName.".created_at,'%Y-%m-%d') as dtime"; 
         $orderGoodsActivity = $this->getDataModel($selects,$params);
-        $total = $orderGoodsActivity->orderBy('dtime','asc')->groupBy('dtime')->get()->toArray();
+        $total = $orderGoodsActivity->orderBy('dtime','desc')->groupBy('dtime')->get()->toArray();
 
         return $total ?? [];
     }
@@ -119,7 +108,7 @@ class GoodsActivityReport extends EloquentRepository
      */
     public function getMarketData($params = [])
     {
-        $selects = "SUM(lanzu_order_goods.number) as total,SUM((original_price-price)*number) as subsidy_total,market_id"; 
+        $selects = "SUM(".Model::$tableName.".number) as total,SUM((original_price-price)*number) as subsidy_total,market_id"; 
         $orderGoodsActivity = $this->getDataModel($selects,$params);
         $total = $orderGoodsActivity->groupBy('market_id')->get()->toArray();
 

app/Admin/Repositories/v3/GoodsReport.php

@@ -6,6 +6,8 @@ use App\Models\LanzuOrderGoods as Model;
 use Dcat\Admin\Grid\Model as GridModel;
 use Dcat\Admin\Repositories\EloquentRepository;
 use Illuminate\Support\Facades\DB;
+use App\Models\ImsCjdcOrderMain as OrderMainModel;
+use App\Models\ImsCjdcOrder as OrderModel;
 
 class GoodsReport extends EloquentRepository
 {
@@ -37,9 +39,9 @@ class GoodsReport extends EloquentRepository
             $where = ['market_id'=>$this->params['market_id']];
         }
        
-        $selects = 'SUM(number) as total,SUM((original_price-price)*number) as subsidy_total,price,original_price,lanzu_order_goods.goods_id,lanzu_order_goods.name,lanzu_order_goods.cover_img,lanzu_order_main.market_id,lanzu_order.store_id';
+        $selects = Model::$tableName.'.goods_id,'.Model::$tableName.'.name,price,original_price,'.Model::$tableName.'.cover_img,'.OrderMainModel::$tableName.'.market_id,'.OrderModel::$tableName.'.store_id,number,'.OrderMainModel::$tableName.'.created_at,global_order_id';
         $orderGoodsActivity = $this->getDataModel($selects,$where);
-        $list = $orderGoodsActivity->orderBy('total','desc')->groupBy('goods_id','lanzu_order_goods.name','cover_img','market_id','store_id','price','original_price')->paginate($perPage);
+        $list = $orderGoodsActivity->paginate($perPage);
         $list = $list->toArray(); 
 
         return $model->makePaginator(
@@ -50,7 +52,6 @@ class GoodsReport extends EloquentRepository
 
     public function getDataModel($selects,$params = [])
     {
-        $time = date('Y-m-d',time());
         // 获取筛选参数
         $name = $params['name'] ?? request()->input('name', '');
         $marketId = $params['market_id'] ?? request()->input('market_id',0);
@@ -60,14 +61,14 @@ class GoodsReport extends EloquentRepository
         $endTime = $params['end_time'] ?? request()->input('end_time','');
 
         $orderGoodsActivity = Model::select(DB::raw($selects))
-            ->join('lanzu_order','lanzu_order_goods.order_id','=','lanzu_order.id')
-            ->join('lanzu_order_main','lanzu_order.order_main_id','=','lanzu_order_main.global_order_id')
-            ->where('lanzu_order_goods.activity_type',1)
-            ->where('lanzu_order_goods.status',1)
-            ->whereIn('lanzu_order_main.state',[4,5,10,11]);
+            ->join(OrderModel::$tableName,Model::$tableName.'.order_id','=',OrderModel::$tableName.'.id')
+            ->join(OrderMainModel::$tableName,OrderModel::$tableName.'.order_main_id','=',OrderMainModel::$tableName.'.global_order_id')
+            ->where(Model::$tableName.'.activity_type',1)
+            ->where(Model::$tableName.'.status',1)
+            ->whereIn(OrderMainModel::$tableName.'.state',[4,5,10,11]);
 
         if($name){
-            $orderGoodsActivity->where('lanzu_order_goods.name','like',"%$name%"); 
+            $orderGoodsActivity->where(Model::$tableName.'.name','like',"%$name%"); 
         }
         if($marketId){
             $orderGoodsActivity->where('market_id',$marketId); 
@@ -76,28 +77,15 @@ class GoodsReport extends EloquentRepository
             $orderGoodsActivity->where('store_id',$storeId); 
         }
         if($startTime){
-            $date = $startTime;
             $startTime = $startTime.' 00:00:00';
             
-            $orderGoodsActivity->where('lanzu_order_goods.created_at','>=',strtotime($startTime));
-        }else{
-            $date = '2020-06-01';
+            $orderGoodsActivity->where(Model::$tableName.'.created_at','>=',strtotime($startTime));
         }
         if($endTime){
-            $date = $date.' 至 '.$endTime;
             $endTime = $endTime.' 23:59:59';
             
-            $orderGoodsActivity->where('lanzu_order_goods.created_at','<=',strtotime($endTime));
-        }else{
-            $date .= ' 至 '.$time;
+            $orderGoodsActivity->where(Model::$tableName.'.created_at','<=',strtotime($endTime));
         }
-        // if(empty($startTime) && empty($endTime)){
-        //     $date = $time;
-        //     $todayStart = $time.' 00:00:00';
-        //     $todayEnd = $time.' 23:59:59';
-        //     $orderGoodsActivity->where([['lanzu_order_goods.created_at','>=',strtotime($todayStart)]]);
-        //     $orderGoodsActivity->where([['lanzu_order_goods.created_at','<=',strtotime($todayEnd)]]);
-        // }
            
         return $orderGoodsActivity;
     }

app/Admin/Widgets/Charts/OrderGoodsActivityCountChart.php

@@ -38,6 +38,8 @@ class OrderGoodsActivityCountChart extends Line
                 }
                 $subsidyTotal += $value['subsidy_total'];
             }
+            $this->data = array_reverse($this->data);
+            $this->categories = array_reverse($this->categories);
             $this->total['subsidy_total'] = $subsidyTotal;
         }
 

app/Admin/Widgets/Charts/OrderGoodsActivityTotalChart.php

@@ -36,6 +36,8 @@ class OrderGoodsActivityTotalChart extends Bar
                 }
                 $total += $value['total'];
             }
+            $this->data = array_reverse($this->data);
+            $this->categories = array_reverse($this->categories);
             $this->total['number_total'] = $total;
         }
 

app/Admin/routes.php

@@ -93,5 +93,6 @@ Route::group([
     $router->any('/goods_activity_export', 'v3\GoodsActivityReportController@export');
     //普通商品统计
     $router->resource('/goods_report', 'v3\GoodsReportController');
+    $router->any('/goods_report_export', 'v3\GoodsReportController@export');
 });
 

app/Models/ImsCjdcOrder.php

@@ -12,6 +12,8 @@ class ImsCjdcOrder extends Model
     protected $table = 'lanzu_order as order';
     public $timestamps = false;
 
+    public static $tableName = 'lanzu_order';
+
     public function user()
     {
         return $this->hasOne('\App\Models\ImsCjdcUser','id','user_id');

app/Models/ImsCjdcOrderMain.php

@@ -50,6 +50,8 @@ class ImsCjdcOrderMain extends Model
     protected $table = 'lanzu_order_main';
     public $timestamps = false;
 
+    public static $tableName = 'lanzu_order_main';
+
     public function imsCjdcUser()
     {
         return $this->hasOne('\App\Models\ImsCjdcUser', 'id', 'user_id');

app/Models/LanzuOrderGoods.php

@@ -14,6 +14,8 @@ class LanzuOrderGoods extends Model
     protected $table = 'lanzu_order_goods';
     protected $dateFormat = 'U';
 
+    public static $tableName = 'lanzu_order_goods';
+
     public function goods()
     {
         return $this->belongsTo('\App\Models\LanzuGoods','goods_id','id');

resources/lang/zh-CN/goods-report.php

@@ -5,14 +5,16 @@ return [
         'goods_report' => '普通商品统计报表',
     ],
     'fields' => [
-        'goods_id' => 'ID',
+        'goods_id' => '商品ID',
         'name' => '统计名称',
         'cover_img' => '封面图',
         'market_id' => '市场',
         'store_id' => '店铺',
         'price' => '售价',
         'original_price' => '原价',
-        'total' => '统计数量',
+        'number' => '数量',
+        'created_at' => '下单时间',
+        'global_order_id' => '主订单号',
     ],
     'options' => [
     ],