Merge branch 'stabble'

app/Http/Controllers/Wap/Book/ChapterController.php

@@ -83,6 +83,8 @@ class ChapterController extends BaseController
 
     private $is_first_book_order = 0;
 
+    private $domain;
+
     /**
      * @apiVersion 1.0.0
      * @apiDescription 章节列表不分页
@@ -317,6 +319,7 @@ class ChapterController extends BaseController
      */
     public function index(Request $request, $t, $domain, $bid, $cid)
     {
+        $this->domain = $domain;
         $special_user_log = env('SPECIAL_USER_LOG');
         //注意：内部约定用  有此参数不需要强关
         $inter_not_need_sub = $request->has('inter_not_need_sub') ? true : false;
@@ -875,6 +878,8 @@ class ChapterController extends BaseController
         $this->chapter->push_title = [];
         //分享
         $this->chapter->is_show_share_button = 0;
+        //6985的分享配置
+        $this->chapter->share_config = '';
         //阅读底部强关图片 只有123有
         $this->chapter->is_had_subscribe = 0;
         //广告
@@ -1048,6 +1053,21 @@ class ChapterController extends BaseController
         if ($this->is_had_subscribe && in_array($this->distribution_channel_id, [2, 14, 211,4025,4147,691,123]) && $this->user) {//,4147,691,123,4025
             $this->chapter->is_show_share_button = 1;
         }
+        if($this->distribution_channel_id == 6985 && $this->domain == 'leyuee'){
+            $appid = 'wx126331d1732978b0';
+            $appSecret = '76231c41c24d4363243866f5f9dee55f';
+            $config = new ChapterShareWechatConfigService($appid,$appSecret);
+            //$config->setAccessToken('');
+            $config->requestAccessToken();
+            $config->requestJsApiTicket();
+            $url = sprintf(
+                'https://site%s.leyuee.com/reader?bid=%s&cid=%s',
+                $this->en_distribution_channel_id,
+                $this->en_bid,
+                $this->cid
+            );
+            $this->chapter->share_config = $config->getJssdkConfig($url);
+        }
     }
 
     /**

app/Http/Controllers/Wap/Book/Transformers/ChapterTransformer.php

@@ -36,6 +36,7 @@ class ChapterTransformer
             'is_visiable_ad'=>isset($chapter->is_visiable_ad)?$chapter->is_visiable_ad:0,
             'sign_version'=>isset($chapter->sign_version)?$chapter->sign_version:'',
             'sign_items'=>isset($chapter->sign_items)?$chapter->sign_items:'',
+            'share_config'=>$chapter->share_config
             //'is_had_subscribe'=>0
             //'is_need_subscirbe'   =>  $chapter->is_need_subscirbe,
         ];

app/Http/Controllers/Wap/User/UserController.php

@@ -10,6 +10,7 @@ use App\Modules\Statistic\Services\AdVisitStatService;
 use App\Modules\Subscribe\Services\OrderService;
 use App\Modules\User\Services\ForceGuidePersonAccountService;
 use App\Modules\User\Services\ReadRecordService;
+use App\Modules\User\Services\UserBindHkWelfareService;
 use App\Modules\User\Services\UserBindPhoneService;
 use App\Modules\User\Services\UserWealthyOperateRecordService;
 use App\Modules\User\Services\WapReaderPageFissionService;
@@ -717,5 +718,30 @@ where bid in (%s) and is_on_shelf =2 ORDER  by field(book_configs.bid,%s)',$bids
 
         return view('jump.forceGuidePersonalAccountV2',['img'=>$img,'link'=>$link,'title'=>$book_name,'name'=>$personal_info->name]);
     }
+
+    public function crmPushView(Request $request){
+        $out_status = Redis::SISMEMBER('crm:out_channel_sites',$this->distribution_channel_id);
+        if($out_status){
+            $group = 'OUT_ACTIVE';
+        }else{
+            $group = 'ACTIVE';
+        }
+        list($qrcode,$max_uv,$account_id,$one_uv) = redisEnvMulti($group.'_GUIDE_PERSONAL_ACCOUNT_OURS_QRCODE',$group.'_GUIDE_PERSONAL_ACCOUNT_MAX_UV',
+            $group.'_GUIDE_PERSONAL_ACCOUNT_ID',$group.'_GUIDE_PERSONAL_ACCOUNT_MAX_EVERY_UV');
+        $uv = Redis::scard(strtolower($group).'_guide_personal_uv');
+        if(!$max_uv) $max_uv = 100;
+        if($uv >= $max_uv) {
+            $data = ['code'=>-1,'read_url'=>'/continue'];
+            return view('',$data);
+        }
+        $get_info = UserBindHkWelfareService::isHasGet($this->uid);
+        if($get_info)  {
+            $data = ['code'=>-2,'read_url'=>'/continue'];
+            return view('',$data);
+        }else{
+            $data = ['code'=>-3,'read_url'=>'/continue'];
+            return view('',$data);
+        }
+    }
     
 }

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

@@ -2284,7 +2284,12 @@ class WelcomeController extends BaseController
                 $start_time = redisEnv('MONTH_TEMPLATE_COMPARE_START_TIME', 0);
                 if($start_time){
                     if (strtotime($this->user->created_at) < $start_time) {
-                        return '';
+                         return [
+                            'price'=>'30元',
+                            'text' => '30元包月 全站万本精彩小说免费看',
+                            'link'=> generateMonthOrderUrl($this->uid)
+                            //'link'=> '/rmonthpay'
+                        ];
                     }else{
                         $attach = $this->uid %2 == 0 ? 'show':'hide';
                         if($attach == 'show'){