|
@@ -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\Statistic\Services\DataAnalysisSelectUserService;
|
|
|
use App\Modules\Subscribe\Services\OrderService;
|
|
|
use App\Modules\User\Services\UserService;
|
|
|
use Illuminate\Http\Request;
|
|
@@ -83,6 +84,8 @@ class WelcomeController extends BaseController
|
|
|
$channel_activities_flag = $this->judgeChannelActivity($user);
|
|
|
//最近阅读页面 推荐
|
|
|
$latest_read_rec_books = $this->latest_read_rec_books($channel,$user->sex);
|
|
|
+ //广告样本
|
|
|
+ $adTargetId = $this->isUserInAdSample();
|
|
|
|
|
|
$options = json_encode([
|
|
|
'distribution_channel_id' => (int)$this->distribution_channel_id,
|
|
@@ -108,7 +111,9 @@ class WelcomeController extends BaseController
|
|
|
'sex' => $user ? $user->sex : 0,
|
|
|
'latest_read_rec_books' => $latest_read_rec_books,
|
|
|
'fission'=>$this->fission(),//裂变
|
|
|
- 'channel_activities'=>$channel_activities_flag
|
|
|
+ 'channel_activities'=>$channel_activities_flag,
|
|
|
+ 'adTargetId'=>$adTargetId,
|
|
|
+ 'ad_type'=>'1'
|
|
|
]);
|
|
|
if($this->uid == env('SPECIAL_USER_LOG',2)){
|
|
|
myLog('special')->info('welcome --------------------------');
|
|
@@ -415,6 +420,17 @@ class WelcomeController extends BaseController
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
+ //用户是否在广告样本中
|
|
|
+ private function isUserInAdSample(){
|
|
|
+ $res = DataAnalysisSelectUserService::getByUidAndType($this->uid,'AD');
|
|
|
+ if($res){
|
|
|
+ return true;
|
|
|
+ }else{
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 三天回本活动
|
|
|
* @param Request $request
|