tusx 6 年 前
コミット
c99b069e51

+ 3 - 1
app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -7,6 +7,7 @@ use App\Jobs\SendTexts;
 use App\Modules\Activity\Services\ActivitySwitchService;
 use App\Modules\Channel\Services\ChannelActivitiesService;
 use App\Modules\Channel\Services\ChannelService;
+use App\Modules\Cpa\Services\AdvertiseUserQueueService;
 use App\Modules\OfficialAccount\Services\ForceSubscribeService;
 use App\Modules\Statistic\Services\DataAnalysisSelectUserService;
 use App\Modules\Subscribe\Services\OrderService;
@@ -445,7 +446,8 @@ class WelcomeController 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 [
                 'appad'=>true,

+ 4 - 0
app/Modules/Cpa/Models/AdvertiseUserQueque.php

@@ -22,4 +22,8 @@ class AdvertiseUserQueque extends Model
     public static function getUserAdvertiseSubscribe($uid,$bid){
         return self::where('uid',$uid)->where('bid',$bid)->where('status',1)->first();
     }
+
+    public static function getUserAdvertise($uid) {
+        return self::where('uid',$uid)->where('status',1)->first();
+    }
 }

+ 4 - 0
app/Modules/Cpa/Services/AdvertiseUserQueueService.php

@@ -20,4 +20,8 @@ class AdvertiseUserQueueService
     public static function getUserAdvertiseSubscribe($uid,$bid) {
         return AdvertiseUserQueque::getUserAdvertiseSubscribe($uid,$bid);
     }
+
+    public static function getUserAdvertise($uid){
+        return AdvertiseUserQueque::getUserAdvertise($uid);
+    }
 }