时间筛选

app/controller/merchant/user/User.php

@@ -847,19 +847,20 @@ class User extends BaseController
                 $query->where('status',$status);
             })->when($p_phone != '',function ($query) use ($spread_uid){
                 $query->where('spread_uid',$spread_uid);
-            })->when(isset($whereTime['user_time_type']) && $whereTime['user_time_type'] !== '' && $whereTime['user_time'] != '', function ($query) use ($whereTime) {
+            // })->when(isset($whereTime['user_time_type']) && $whereTime['user_time_type'] !== '' && $whereTime['user_time'] != '', function ($query) use ($whereTime) {
+            })->when($whereTime['user_time'] != '', function ($query) use ($whereTime) {
                 list($startTime, $endTime) = explode('-', $whereTime['user_time']);
-                if ($whereTime['user_time_type'] == 'visitno') {
-                    $query->whereTime("last_time", 'between', [$startTime, $endTime]);
-                }
-                if ($whereTime['user_time_type'] == 'visit') {
-                    $query->whereTime('u.last_time', '>=', $startTime);
-                    $query->whereTime('u.last_time', '<', $endTime);
-                }
-                if ($whereTime['user_time_type'] == 'add_time') {
+                // if ($whereTime['user_time_type'] == 'visitno') {
+                //     $query->whereTime("last_time", 'between', [$startTime, $endTime]);
+                // }
+                // if ($whereTime['user_time_type'] == 'visit') {
+                //     $query->whereTime('u.last_time', '>=', $startTime);
+                //     $query->whereTime('u.last_time', '<', $endTime);
+                // }
+                // if ($whereTime['user_time_type'] == 'add_time') {
                     $query->whereTime('create_time', '>=', $startTime);
                     $query->whereTime('create_time', '<', $endTime);
-                }
+                // }
             })->order('create_time desc');
         $date['list'] = $query->page($page, $limit)->select()
             ->each(function ($item) {