fix

app/Jobs/Push/NewUserPushMsg.php

@@ -97,43 +97,46 @@ class NewUserPushMsg implements ShouldQueue
     {
         $result = true;
         $conditions = json_decode($filter, true);
-        foreach ($conditions as $key => $value) {
-            $condition = $this->getCondition($key, $value);
-            if ($result && $condition) {
-                switch ($key) {
-                    case  'balance':
-                        $balance = $this->findUserBalance($uid);
-                        $result = $condition[0] ? $balance >= $condition[0] && ($condition[1] ? $balance <= $condition[1] : true) : true;
-                        break;
-                    case 'paid':
-                        switch ($value) {
-                            case 'unpaid':
-                                $result = !Order::where('uid', $uid)->where('status', 'PAID')->exists();
-                                break;
-                            case 'paid':
-                                $result = Order::where('uid', $uid)->where('status', 'PAID')->exists();
-                                break;
-                            case 'vip':
-                                $result = Order::where('uid', $uid)->where('status', 'PAID')->where('order_type', 'YEAR')->exists();
-                                break;
-                        }
-                        break;
-                    case 'add_desktop':
-                        $result = ($value == QappUserAddDestop::where('uid', $uid)->where('status', 1)->exists());
-                        break;
+        if ($conditions) {
+            foreach ($conditions as $key => $value) {
+                $condition = $this->getCondition($key, $value);
+                if ($result && $condition) {
+                    switch ($key) {
+                        case  'balance':
+                            $balance = $this->findUserBalance($uid);
+                            $result = $condition[0] ? $balance >= $condition[0] && ($condition[1] ? $balance <= $condition[1] : true) : true;
+                            break;
+                        case 'paid':
+                            switch ($value) {
+                                case 'unpaid':
+                                    $result = !Order::where('uid', $uid)->where('status', 'PAID')->exists();
+                                    break;
+                                case 'paid':
+                                    $result = Order::where('uid', $uid)->where('status', 'PAID')->exists();
+                                    break;
+                                case 'vip':
+                                    $result = Order::where('uid', $uid)->where('status', 'PAID')->where('order_type', 'YEAR')->exists();
+                                    break;
+                            }
+                            break;
+                        case 'add_desktop':
+                            $result = ($value == QappUserAddDestop::where('uid', $uid)->where('status', 1)->exists());
+                            break;
+                    }
                 }
             }
+            return $result;
         }
-        return $result;
     }
 
     private function getCondition($key, $value)
     {
-        foreach (self::condition[$key] as $item) {
-            if ($item['value'] == $value) {
-                return $item['condition'];
+        if (array_key_exists($key, self::condition))
+            foreach (self::condition[$key] as $item) {
+                if ($item['value'] == $value) {
+                    return $item['condition'];
+                }
             }
-        }
         return '';
     }
 }

app/Jobs/Push/NewUserPushMsgDelay.php

@@ -38,7 +38,6 @@ class NewUserPushMsgDelay implements ShouldQueue
         $send_order = QappSendOrder::where('send_order_id', $send_order_id)->first();
         $account = $send_order->account;
         return QappNewUserPushTask::where('qapp_account', $account)
-            ->where('status', 1)
             ->where('is_enabled', 1)
             ->where('is_deleted', 0)
             ->get();
@@ -54,6 +53,7 @@ class NewUserPushMsgDelay implements ShouldQueue
         $tasks = $this->findUserTasks();
         foreach ($tasks as $task) {
             $job = new NewUserPushMsg($this->uid, $task);
+            $job->handle();
             dispatch($job)->onConnection('rabbitmq')->onQueue('new_user_push_msg')->delay($task->time_delay);
         }
     }

app/Modules/Push/Models/QappNewUserPushTask.php

@@ -23,7 +23,6 @@ class QappNewUserPushTask extends Model
         'content',
         'url',
         'providers',
-        'status',
         'push_filter',
         'push_result',
         'name',