Merge remote-tracking branch 'origin/master'

app/Console/Commands/MassMsgSend.php

@@ -88,6 +88,9 @@ class MassMsgSend extends Command
         $tagList = $ruleInfo['tag_list'];
         $excludeTagList = $ruleInfo['exclude_tag_list'];
         $createdAt = $ruleInfo['created_at'];
+        $payStatus = $ruleInfo['pay_status'];
+        $payNumMin = $ruleInfo['pay_num_min'];
+        $payNumMax = $ruleInfo['pay_num_max'];
 
         # 处理附件内容中的素材ID
         $attachments = json_decode($attachments, true);
@@ -95,7 +98,6 @@ class MassMsgSend extends Command
 
         $search = array();
 
-
         if($customerFilter){
             if(!empty($gender)) {
                 $search['gender'] = $gender;
@@ -136,6 +138,18 @@ class MassMsgSend extends Command
 
                 $search['tag_list'] = explode(',', $tagList);
             }
+
+            if(is_numeric($payStatus)) {
+                $search['pay_status'] = $payStatus;
+            }
+
+            if(is_numeric($payNumMin)) {
+                $search['pay_num_min'] = $payNumMin;
+            }
+
+            if(is_numeric($payNumMax)) {
+                $search['pay_num_max'] = $payNumMax;
+            }
         }