From 42cbfb7b86af6495c357ecd1e454d515bda88d82 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Tue, 20 Oct 2020 15:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81--=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Repositories/v3/GoodsReport.php | 14 +++++++-------
 app/Models/ImsCjdcOrder.php               |  6 +++++-
 app/Models/LanzuOrderGoods.php            |  7 +++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/Admin/Repositories/v3/GoodsReport.php b/app/Admin/Repositories/v3/GoodsReport.php
index 26c9f02..22b87fc 100644
--- a/app/Admin/Repositories/v3/GoodsReport.php
+++ b/app/Admin/Repositories/v3/GoodsReport.php
@@ -2,7 +2,7 @@
 
 namespace App\Admin\Repositories\v3;
 
-use App\Models\v3\GoodsActivity as Model;
+use App\Models\LanzuOrderGoods as Model;
 use Dcat\Admin\Grid\Model as GridModel;
 use Dcat\Admin\Repositories\EloquentRepository;
 use Illuminate\Support\Facades\DB;
@@ -27,16 +27,16 @@ class GoodsReport extends EloquentRepository
         $startTime = request()->input('start_time');
         $endTime = request()->input('end_time');
        
-        $orderMainOnline = Model::select(DB::raw('COUNT(id) AS total_num'));
+        $orderGoodsActivity = Model::select(DB::raw('COUNT(goods.id) as total,goods_id,goods.name'));
        
         if($marketId){
-            $orderMainOnline->where('market_id',$marketId); 
+            $orderGoodsActivity->where('market_id',$marketId); 
         }
         if($startTime){
             $date = $startTime;
             $startTime = $startTime.' 00:00:00';
             
-            $orderMainOnline->where([['created_at','>=',strtotime($startTime)]]);
+            $orderGoodsActivity->where([['created_at','>=',strtotime($startTime)]]);
 
         }else{
             $date = '2020-06-01';
@@ -45,7 +45,7 @@ class GoodsReport extends EloquentRepository
             $date = $date.' 至 '.$endTime;
             $endTime = $endTime.' 23:59:59';
             
-            $orderMainOnline->where([['created_at','<=',strtotime($endTime)]]);
+            $orderGoodsActivity->where([['created_at','<=',strtotime($endTime)]]);
 
         }else{
             $date .= ' 至 '.$time;
@@ -56,10 +56,10 @@ class GoodsReport extends EloquentRepository
             $todayStart = $time.' 00:00:00';
             $todayEnd = $time.' 23:59:59';
 
-            $orderMainOnline->where([['created_at','>=',strtotime($todayStart)]]);
+            $orderGoodsActivity->where([['created_at','>=',strtotime($todayStart)]]);
         }
        
-        $orderReportOnline = $orderMainOnline->get()->toArray();
+        $orderReportOnline = $orderGoodsActivity->get()->toArray();
 
         $query =  [
             'order_total_num_online' => !empty($orderReportOnline[0]['total_num'])?$orderReportOnline[0]['total_num']:0,
diff --git a/app/Models/ImsCjdcOrder.php b/app/Models/ImsCjdcOrder.php
index 6f28e83..9888fea 100644
--- a/app/Models/ImsCjdcOrder.php
+++ b/app/Models/ImsCjdcOrder.php
@@ -3,8 +3,8 @@
 namespace App\Models;
 
 use Dcat\Admin\Traits\HasDateTimeFormatter;
-
 use Illuminate\Database\Eloquent\Model;
+use App\Admin\Repositories\ImsCjdcOrderMain as OrderMainModel;
 
 class ImsCjdcOrder extends Model
 {
@@ -46,5 +46,9 @@ class ImsCjdcOrder extends Model
         return ['orders'=>$orders,'show_refund'=>$show_refund];
     }
 
+    public function orderMain()
+    {
+        return $this->belongsTo(new OrderMainModel,'order_main_id','global_order_id');
+    }
 
 }
diff --git a/app/Models/LanzuOrderGoods.php b/app/Models/LanzuOrderGoods.php
index d2d2d4c..8e262fc 100644
--- a/app/Models/LanzuOrderGoods.php
+++ b/app/Models/LanzuOrderGoods.php
@@ -5,6 +5,7 @@ namespace App\Models;
 
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\Model;
+use App\Models\ImsCjdcOrder as OrderModel;
 
 class LanzuOrderGoods extends Model
 {
@@ -17,4 +18,10 @@ class LanzuOrderGoods extends Model
     {
         return $this->belongsTo('\App\Models\LanzuGoods','goods_id','id');
     }
+
+    public function order()
+    {
+        return $this->belongsTo(new OrderModel,'order_id','id');
+    }
+    
 }