Merge branch 'stabble'

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

@@ -45,6 +45,8 @@ class WelcomeController extends BaseController
 
     private $user = null;
 
+    private $activity_status = 0;
+
     /**
      * 首页
      */
@@ -63,6 +65,7 @@ class WelcomeController extends BaseController
         $activity_options = $this->activityOptions();
         $url = $activity_options['url'];
         $is_show_activity = $activity_options['is_show_activity'];
+        $this->activity_status = $is_show_activity;
         $activity_title = $activity_options['activity_title'];
         $bottom_show_type = $activity_options['bottom_show_type'];
         $activity_img = $activity_options['activity_img'];
@@ -541,6 +544,7 @@ class WelcomeController extends BaseController
         if ($this->distribution_channel_id == 6130) return '微友书坊';
         if ($this->distribution_channel_id == 6667) return '青青书舍';
         if ($this->distribution_channel_id == 7264) return '悠悠书汇';
+        if ($this->distribution_channel_id == 7070) return '小飞文苑';
         $title = "追书云";
         $get_force_subscribe_name = false;
         $subscribe = $request->cookie('force_subscribe_name');
@@ -2170,6 +2174,10 @@ class WelcomeController extends BaseController
             'OUT_ACTIVE_GUIDE_PERSONAL_ACCOUNT_OURS_QRCODE',
             'ACTIVE_GUIDE_PERSONAL_ACCOUNT_OURS_QRCODE'
         );
+        $banner = '';
+        if(!$this->activity_status){
+            $banner = 'https://cdn-novel.iycdm.com/crm/guide/reader-banner.jpg';
+        }
         //if(in_array($thy))
         if ($inner_sites && in_array($this->distribution_channel_id, explode(',', $inner_sites))) {
             //1.包年包月用户
@@ -2186,14 +2194,14 @@ class WelcomeController extends BaseController
             if(!$charge) return '';
             if($year_qrcode && OrderService::isYearOrderUser($this->uid) ){
                 //包年
-                return ['title' => '包年VIP专属爆款小说书单>>', 'link' => '/guidestremv2?group=ACTIVE_YEAR&fee=500'];
+                return ['title' => '包年VIP专属爆款小说书单>>', 'link' => '/guidestremv2?group=ACTIVE_YEAR&fee=500','banner'=>$banner];
             }
             if($month_qrcode && UserMonthService::isMonthOrderUser($this->uid) ){
                 //包月
-                return ['title' => '包月VIP专属爆款小说书单>>', 'link' => '/guidestremv2?group=ACTIVE_MONTH&fee=500'];
+                return ['title' => '包月VIP专属爆款小说书单>>', 'link' => '/guidestremv2?group=ACTIVE_MONTH&fee=500','banner'=>$banner];
             }
             if($active_qrcode){
-                return ['title' => '您有500书币待领取>>', 'link' => '/guidestrem?uid=' . $this->uid . '&fee=500'];
+                return ['title' => '您有500书币待领取>>', 'link' => '/guidestrem?uid=' . $this->uid . '&fee=500','banner'=>$banner];
             }
             return '';
         }
@@ -2234,7 +2242,7 @@ class WelcomeController extends BaseController
                 return '';
             }
             Cookie::queue('is_force_out_guide', 1);
-            return ['title' => '您有500书币待领取>>', 'link' => '/guidestrem?uid=' . $this->uid . '&fee=500'];
+            return ['title' => '您有500书币待领取>>', 'link' => '/guidestrem?uid=' . $this->uid . '&fee=500','banner'=>$banner];
         }
         //渠道自己导粉
         $other_crm_config = Redis::hmget('channel:setting:' . $this->distribution_channel_id, ['crm_status', 'crm_link']);
@@ -2242,7 +2250,7 @@ class WelcomeController extends BaseController
         $get_info = UserBindHkWelfareService::isHasGet($this->uid);
         if ($get_info) return '';
         if($this->is_paid || $this->distribution_channel_id == 6687)
-            return ['title' => '点击领取200书币>>', 'link' => $other_crm_config[1]];
+            return ['title' => '点击领取200书币>>', 'link' => $other_crm_config[1],'banner'=>''];
         return '';
     }
     private function guidePersonalAccount($openid)

app/Modules/Book/Services/CrmBookAutoRecommendService.php

@@ -85,7 +85,9 @@ class CrmBookAutoRecommendService
    {
       $value = Redis::get($this->redis_key);
       if ($value) {
-         return json_decode($value, true);
+         $result =  json_decode($value, true);
+          if($result) return $result;
+          return  $this->setRecommendBooksRedis();
       } else {
          return  $this->setRecommendBooksRedis();
       }
@@ -120,5 +122,6 @@ class CrmBookAutoRecommendService
          })->all();
          return $results;
       }
+      return [];
    }
 }