Merge branch 'kuaiyingyong' into kuaiyingyong_wcc

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

@@ -58,7 +58,8 @@ class ChapterController extends BaseController
     {
         // 查询书籍是否限免
         $isFree = BookConfigService::judgeBookIsFree($bid);
-
+        //渠道自定义vip章节
+        $vip_sequence = Redis::hget('channel:chapterfee:setting:' . $this->distribution_channel_id, $bid);
         switch ($book_info->charge_type) {
             case 'BOOK':
                 $price          = $this->getPrice($book_info);
@@ -72,6 +73,13 @@ class ChapterController extends BaseController
                         $v->is_need_charge = false;
                         $v->price          = 0;
                     }
+                    if($vip_sequence){
+                        if($v->sequence >= $vip_sequence){
+                            $v->is_vip = 1;
+                        }else{
+                            $v->is_vip = 0;
+                        }
+                    }
                 }
                 break;
             default:
@@ -84,6 +92,13 @@ class ChapterController extends BaseController
                         $v->price          = $v->is_vip ? $this->getPrice($book_info, $v->size) : 0;
                         $v->is_need_charge = $v->is_vip ? $this->isChapterNeedCharge($bid, $v->id, $v->price) : false;
                     }
+                    if($vip_sequence){
+                        if($v->sequence >= $vip_sequence){
+                            $v->is_vip = 1;
+                        }else{
+                            $v->is_vip = 0;
+                        }
+                    }
                 }
                 break;
         }
@@ -110,6 +125,15 @@ class ChapterController extends BaseController
             $job = new UserRententionJob($this->uid, now(), $this->user_info->created_at);
             dispatch($job)->onConnection('rabbitmq')->onQueue('user_rentention_queue');
         }
+        //自定义vip章节
+        $vip_sequence = Redis::hget('channel:chapterfee:setting:' . $this->distribution_channel_id, $bid);
+        if($vip_sequence){
+            if($chapter->sequence >= $vip_sequence){
+                $chapter->is_vip = 1;
+            }else{
+                $chapter->is_vip = 0;
+            }
+        }
 
         if ($chapter->is_vip == 0) {
             ReadRecordService::addReadLog($this->uid, [