From 1aefbaf1449d085dd377236804760b3aceac7d5b Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 25 Sep 2020 17:59:24 +0800
Subject: [PATCH] 1

---
 app/Admin/Actions/Tools/ShowOrderStateHandle.php | 2 +-
 app/Admin/Repositories/ImsCjdcOrderMain.php      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Actions/Tools/ShowOrderStateHandle.php b/app/Admin/Actions/Tools/ShowOrderStateHandle.php
index 8c3e38b..7d46b06 100644
--- a/app/Admin/Actions/Tools/ShowOrderStateHandle.php
+++ b/app/Admin/Actions/Tools/ShowOrderStateHandle.php
@@ -17,7 +17,7 @@ class ShowOrderStateHandle extends  AbstractTool
 
     protected function script()
     {
-        $url = "order?state=".$this->state;
+        $url = "order?state=".$this->state.'&'."time=".(time()-(7*86400));
         return <<<JS
 $(".order_state_{$this->state}").on('click',function () {
         window.location.href = "{$url}"
diff --git a/app/Admin/Repositories/ImsCjdcOrderMain.php b/app/Admin/Repositories/ImsCjdcOrderMain.php
index eac9aed..9554683 100644
--- a/app/Admin/Repositories/ImsCjdcOrderMain.php
+++ b/app/Admin/Repositories/ImsCjdcOrderMain.php
@@ -19,12 +19,16 @@ class ImsCjdcOrderMain extends EloquentRepository
     {
 
         $builder = new \App\Models\ImsCjdcOrderMain();
+        $time = request()->input('time');
+
         $builder = $builder::leftJoin('lanzu_user','lanzu_user.id','lanzu_order_main.user_id')
             ->with('market')
             ->select('lanzu_order_main.*','lanzu_user.nick_name')
             ->where('type',1)
             ->orderBy('lanzu_order_main.id','desc');//只取线上订单数据
-
+        if ($time){
+            $builder = $builder->where('lanzu_order_main.created_at','>',$time);
+        }
         $this->setSort($model);
         $this->setPaginate($model);