cpc froce subscribe

app/Http/Controllers/Wap/Book/ChapterController.php

@@ -1799,7 +1799,8 @@ class ChapterController extends BaseController
             return ;
         }
         //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])){
-        if(! Redis::hget('channel:setting:'.$this->distribution_channel_id,'cpc_status')){
+        $cpc_status = Redis::hget('channel:setting:'.$this->distribution_channel_id,'cpc_status');
+        if($cpc_status === '0'){
             return ;
         }
         //按章付费才显示

app/Http/Controllers/Wap/Subscribe/LinkSubscribeController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Wap\Subscribe;
 use App\Modules\Cpa\Services\AdvertiseUserQueueService;
 use App\Modules\OfficialAccount\Services\ForceSubscribeService;
 use App\Modules\Subscribe\Services\OrderService;
+use App\Modules\User\Services\UserDivisionCpcPropertyService;
 use App\Modules\User\Services\UserService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -98,10 +99,10 @@ class LinkSubscribeController extends Controller
 
         if($this->appad($uid,$distribution_channel_id)){
             if($uid % 2 == 0){
-                $this->userForceSubscribeTemplate($uid,$distribution_channel_id,4);
+                $this->userForceSubscribeTemplate($uid,$distribution_channel_id,6);
                 return view('wap.subscribeV3', compact('title', 'img', 'head_img', 'num', 'template'));
             }else{
-                $this->userForceSubscribeTemplate($uid,$distribution_channel_id,3);
+                $this->userForceSubscribeTemplate($uid,$distribution_channel_id,5);
                 return view('wap.subscribeV2', compact('title', 'img', 'head_img', 'num', 'template'));
             }
         }else{
@@ -126,14 +127,19 @@ class LinkSubscribeController extends Controller
 
     private function appad($uid, $distribution_channel_id)
     {
-        $ads_open_site = env('ADS_OPEN_SITE','');
+        /*$ads_open_site = env('ADS_OPEN_SITE','');
         if($ads_open_site == 'all'){
             return UserService::isCpcUser($uid);
+        }*/
+        $cpc_status = Redis::hget('channel:setting:'.$distribution_channel_id,'cpc_status');
+        if(is_null($cpc_status) || $cpc_status == 1){
+            $prop = UserDivisionCpcPropertyService::getUserProperty($uid);
+            return $prop == 'none';
         }
-
-        if (!in_array($distribution_channel_id, explode(',', $ads_open_site))) {
+        return false;
+        /*if (!in_array($distribution_channel_id, explode(',', $ads_open_site))) {
             return false;
         }
-        return UserService::isCpcUser($uid);
+        return UserService::isCpcUser($uid);*/
     }
 }

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

@@ -531,7 +531,8 @@ class WelcomeController extends BaseController
     //CPC广告的优化逻辑
     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])){
-        if(Redis::hget('channel:setting:'.$this->distribution_channel_id,'cpc_status')){
+        $cpc_status = Redis::hget('channel:setting:'.$this->distribution_channel_id,'cpc_status');
+        if(is_null($cpc_status) || $cpc_status == 1){
             $cookie_ad_status = Cookie::get('cpc_ad_status');
             if($cookie_ad_status) return $cookie_ad_status == 'show';
             $property = UserDivisionCpcPropertyService::userLevel($openid);