Merge branch 'free_share' of iqiyoo:zhuishuyun_wap into free_share

app/Http/Controllers/Wap/Advertises/ShareController.php

@@ -29,6 +29,7 @@ class ShareController extends BaseController
         if(empty($distribution_channel_id)||empty($uid)||empty($bid_encode)) {
             return response()->error('PARAM_EMPTY');
         }
+        $distribution_channel_id = decodeDistributionChannelId($distribution_channel_id);
         $bid =Hashids::decode($bid_encode)[0];
         $book_info = BookConfigService::getBookById($bid);
         if(!$book_info){

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

@@ -131,6 +131,9 @@ class WelcomeController extends BaseController
             'appad_banner'=>'',
             'appad_url'=>''
         ];
+        //无充值用户分享
+        $share_switch = 0;
+        $share_switch = ($this->appad())?1:0;
         //突出包年的充值页面
         $outstanding_year_order = $this->outstandingYearOrder();
 
@@ -170,7 +173,9 @@ class WelcomeController extends BaseController
             'appad'=>$add_ad_status['appad'],
             'appad_banner'=>$add_ad_status['appad_banner'],
             'appad_url'=>$add_ad_status['appad_url'],
-            'outstanding_year_order'=>$outstanding_year_order
+            'outstanding_year_order'=>$outstanding_year_order,
+            'share_domain'=>env('share_domain'),
+            'share_switch'=>$share_switch
         ]);
         if ($this->uid == env('SPECIAL_USER_LOG', 2)) {
             myLog('special')->info('welcome --------------------------');
@@ -483,7 +488,7 @@ class WelcomeController extends BaseController
             //\Log::info('：'.($this->uid).'force_subs1:'.json_encode($force_subscribe_info));
         }
         if(!$force_subscribe_info){
-            return ['appad'=>false,'appad_banner'=>'','appad_url'=>''];
+            return false;
         }
         $force_sub_user_by_openid = ForceSubscribeUserIService::getForceSubscribeByUidOpenid($this->uid);
         if($force_sub_user_by_openid){
@@ -494,15 +499,11 @@ class WelcomeController extends BaseController
             (time()-strtotime($force_subscribe_info->subscribe_time) >=3*86400)
             && !OrderService::isPaidUserByOpenid($force_subscribe_info->openid) &&
             !AdvertiseUserQueueService::getUserAdvertise($this->uid) &&
-            in_array($this->distribution_channel_id,explode(',',env('ADS_OPEN_SITE')))
+            in_array($this->distribution_channel_id,explode(',',env('SHARE_OPEN_SITE')))
         ){
-            return [
-                'appad'=>true,
-                'appad_banner'=>'https://cdn-novel.iycdm.com/h5/app-ad-banner.jpg',
-                'appad_url'=>'/advertise/show?uid='.Hashids::encode($this->uid)
-            ];
+            return true;
         }
-        return ['appad'=>false,'appad_banner'=>'','appad_url'=>''];
+        return false;
     }
 
     //CPC广告的优化逻辑