advertise

app/Http/Controllers/Wap/Order/OrdersController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Wap\Order;
 
 use App\Http\Controllers\Wap\BaseController;
 use App\Modules\Channel\Services\ChannelService;
+use App\Modules\Cpa\Services\AdvertiseUserQueueService;
 use App\Modules\OfficialAccount\Services\ForceSubscribeService;
 use App\Modules\Statistic\Services\AdVisitStatService;
 use App\Modules\Statistic\Services\DataAnalysisSelectUserService;
@@ -110,7 +111,7 @@ class OrdersController extends BaseController
                 }
 
             }*/
-            $this->appad();
+            $appad = $this->appad();
 
             foreach ($res as $v) {
                 $intro = [];
@@ -170,6 +171,7 @@ class OrdersController extends BaseController
                     'intro' => $intro,
                     'intro2' => $intro2,
                     'is_default' => $v->is_default,
+                    'show_free_ads'=>$appad
                 ];
             }
             return response()->success($data);
@@ -707,7 +709,8 @@ class OrdersController extends BaseController
         }
         if($this->force_subscribe_info->subscribe_time &&
             (time()-strtotime($this->force_subscribe_info->subscribe_time) >=3*86400)
-            && !OrderService::isPaidUser($this->uid)
+            && !OrderService::isPaidUser($this->uid) &&
+            !AdvertiseUserQueueService::getUserAdvertise($this->uid)
         ){
             return 1;
         }