ad target

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -94,7 +94,7 @@ class WelcomeController extends BaseController
         $ad_status = env('AD_STATUS', 1);
         $adTargetId = false;
         if ($ad_status) {
-            $adTargetId = $this->isUserInAdSample();
+            $adTargetId = $this->cpcAd();
         }
         //广告frame
         $is_show_ad_frame_setting = env('IS_SHOW_AD_FRAME_SETTING', '123');
@@ -152,8 +152,7 @@ class WelcomeController extends BaseController
                   }
               }
         }
-        //CPC广告
-        $this->cpcAd();
+
         $options = json_encode([
             'distribution_channel_id' => (int)$this->distribution_channel_id,
             'send_order_id' => $send_order_id,
@@ -529,14 +528,14 @@ class WelcomeController extends BaseController
     private function cpcAd(){
         if(in_array($this->distribution_channel_id,[2,5,8,14,123,146,148,155,160,196,202,211,255,256,266,271,273,318,691,695,722,4025,4053,4174,4236,4237,4241,4334,4364,4426,4427,4487,4488,4593,4742,4889,4891,5204])){
             $cookie_ad_status = Cookie::get('cpc_ad_status');
-            if($cookie_ad_status) return ;
+            if($cookie_ad_status) return $cookie_ad_status == 'show';
             if(UserService::isCpcUser($this->uid)){
                 Cookie::queue('cpc_ad_status', 'show', 3600);
-                return ;
+                return true;
             }
         }
         Cookie::queue('cpc_ad_status', 'unshow', 3600);
-        return ;
+        return false;
     }
     /**
      * 获取客服图片