cpc ad test and crm activity jump bug

app/Http/Controllers/Wap/User/CoflController.php

@@ -140,18 +140,17 @@ class CoflController extends Controller
         $activity = ActivityService::getByToken($token);
         if($activity){
             $user = $this->getUsers($openid);
-            if($user[0]){
-                $url_format = '%s://site%s.%s.com%s';
-                $activity_page = $activity->activity_page ;
-                if($activity->id == 6000){
-                    $activity_page = '/activity/common?token=LNyAqbFMgvkmvnHP8PXV3DYPIIhQm3oe';
-                }
-                $url = sprintf($url_format, env('PROTOCOL'), encodeDistributionChannelId($user[1]),
-                    env('CUSTOM_HOST'),
-                    $activity_page
-                );
-                return redirect()->to($url);
+            $distribution_channel_id = (isset($user[1]) && !empty($user[1]))?$user[1]:123;
+            $url_format = '%s://site%s.%s.com%s';
+            $activity_page = $activity->activity_page ;
+            if($activity->id == 6000){
+                $activity_page = '/activity/common?token=LNyAqbFMgvkmvnHP8PXV3DYPIIhQm3oe';
             }
+            $url = sprintf($url_format, env('PROTOCOL'), encodeDistributionChannelId($distribution_channel_id),
+                env('CUSTOM_HOST'),
+                $activity_page
+            );
+            return redirect()->to($url);
         }
         $default_ink = $this->getLink();
         return redirect()->to($default_ink);

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

@@ -101,7 +101,7 @@ class WelcomeController extends BaseController
         $ad_status = env('AD_STATUS', 1);
         $adTargetId = false;
         if ($ad_status) {
-            $adTargetId = $this->cpcAd();
+            $adTargetId = $this->cpcAd($user->openid);
         }
         //广告frame
         $is_show_ad_frame_setting = env('IS_SHOW_AD_FRAME_SETTING', '123');
@@ -523,11 +523,16 @@ class WelcomeController extends BaseController
     }
 
     //CPC广告的优化逻辑
-    private function cpcAd(){
+    private function cpcAd($openid){
         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 $cookie_ad_status == 'show';
-            if(UserService::isCpcUser($this->uid)){
+            $property = UserDivisionCpcPropertyService::userLevel($openid);
+            /*if(UserService::isCpcUser($this->uid)){
+                Cookie::queue('cpc_ad_status', 'show');
+                return true;
+            }*/
+            if($property && $property->property == 'none'){
                 Cookie::queue('cpc_ad_status', 'show');
                 return true;
             }