From 2966d222ea5fd7643cff5245269d37bfacf0cace Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Tue, 5 Nov 2019 20:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=96=E7=95=A5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketingStrategyController.php           | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php
index ce49943..6ad9309 100644
--- a/frontend/controllers/MarketingStrategyController.php
+++ b/frontend/controllers/MarketingStrategyController.php
@@ -521,48 +521,60 @@ class MarketingStrategyController extends UserBaseController
             ->andWhere(['<=','baofei', $total1_clear])
             ->all();
         $ids = [];
+        $flags = [];
         foreach($items as $item) {
-            $flag = false;
             //车牌
+            $flags[0] = 0;
             if($item->car_type_id != '') {
                 $car_type_ids = explode(',',$item->car_type_id);
                 $tmp_type_id = 1;
                 if(mb_substr($car_no, 0, 1, 'utf-8') != '京')
                     $tmp_type_id = 2;
                 if(in_array($tmp_type_id, $car_type_ids)) {
-                    $flag = true;
+                    $flags[0] = 1;
                 } else {
-                    $flag = false;
+                    $flags[0] = -1;
                 }
             }
             //保险公司
+            $flags[1] = 0;
             if($item->company_ids != '') {
                 $company_ids = explode(',',$item->company_ids);
                 if(in_array($company2_id, $company_ids)) {
-                    $flag = true;
+                    $flags[1] = 1;
                 } else {
-                    $flag = false;
+                    $flags[1] = -1;
                 }
             }
             //车辆使用类型
+            $flags[2] = 0;
             if($item->car_use_id != '') {
                 $car_use_ids = explode(',',$item->car_use_id);
                 if(in_array($car_use_id, $car_use_ids)) {
-                    $flag = true;
+                    $flags[2] = 1;
                 } else {
-                    $flag = false;
+                    $flags[2] = -1;
                 }
             }
             //新保、续保
+            $flags[3] = 0;
             if($item->type_ids != '') {
                 $type_ids = explode(',',$item->type_ids);
                 $tmp_type_id = 1;
                 if($car_info->is_xubao > 0)
                     $tmp_type_id = 2;
                 if(in_array($tmp_type_id, $type_ids)) {
-                    $flag = true;
+                    $flags[3] = 1;
                 } else {
+                    $flags[3] = -1;
+                }
+            }
+            $flag = true;
+            foreach($flags as $tmp_flag) {
+                if($tmp_flag == 0) continue;
+                if($tmp_flag == -1) {
                     $flag = false;
+                    break;
                 }
             }
             if($flag) {