优化订单搜索功能, 增加时间搜索和金额范围搜索

app/Admin/Controllers/ImsCjdcOrderMainController.php

@@ -91,6 +91,8 @@ class ImsCjdcOrderMainController extends AdminController
                 if (!(Admin::user()->isRole('market_service'))){
                     $filter->equal('market_id','所属市场')->select(ImsCjdcMarket::getMarket());
                 }
+                $filter->between('created_at','下单时间')->datetime();
+                $filter->between('money','订单金额');
             });
 
             $grid->disableViewButton();

app/Admin/Repositories/ImsCjdcOrderMain.php

@@ -17,6 +17,7 @@ class ImsCjdcOrderMain extends EloquentRepository
 
     public function get(Grid\Model $model)
     {
+
         $builder = new \App\Models\ImsCjdcOrderMain();
         $builder = $builder::leftJoin('lanzu_user','lanzu_user.id','lanzu_order_main.user_id')
             ->with('market')
@@ -33,6 +34,12 @@ class ImsCjdcOrderMain extends EloquentRepository
                 $value['arguments'][1] = $this->getGridColumns();
             } elseif ($value['method'] == 'get') {
                 $value['arguments'] = [$this->getGridColumns()];
+            }elseif ($value['method']=='whereBetween'){
+                if ($value['arguments'][0]=='created_at'){
+                    $value['arguments'][0] = 'lanzu_order_main.created_at';
+                    $value['arguments'][1][0] = strtotime($value['arguments'][1][0]);
+                    $value['arguments'][1][1] = strtotime($value['arguments'][1][1]);
+                }
             }
             $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []);
         });