Merge branch 'kuaiyingyong' into kuaiyingyong_push

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

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\QuickApp\Book;
 
+use App\Modules\SendOrder\Services\SendOrderService;
 use App\Modules\Statistic\Services\WapVisitStatService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\QuickApp\BaseController;
@@ -474,6 +475,8 @@ class ChapterController extends BaseController
         $old = Redis::hget($key, $field);
         if (!$old)  $old = 0;
         Redis::hset($key, $field, $old + 1);
+        $force_add_desk_type = $this->addDesktopType($chapter->sequence);
+        $chapter->force_add_desk_type = $force_add_desk_type;
         //统计
         $this->stats();
         return $chapter;
@@ -679,4 +682,19 @@ class ChapterController extends BaseController
         //阅读器统计
         WapVisitStatService::recordReaderUvAndPv($this->uid, $this->distribution_channel_id);
     }
+
+    //加桌类型
+    private function addDesktopType($sequence){
+        $force_add_desk_type = 0;
+        $send_order_id = ReadRecordService::getSendOrderId($this->uid);
+        if(!$send_order_id) return $force_add_desk_type;
+        $send_order_info = SendOrderService::getById($send_order_id);
+        if(!$send_order_info)  return $force_add_desk_type;
+        if($send_order_info->force_add_desk_type && $send_order_info->force_add_desk_seq){
+            if($sequence >= $send_order_info->force_add_desk_seq){
+                $force_add_desk_type = $send_order_info->force_add_desk_type;
+            }
+        }
+        return $force_add_desk_type;
+    }
 }

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

@@ -18,7 +18,7 @@ class ChapterTransformer
             'recent_update_at'   =>  $chapter->recent_update_at,
             'chapter_content'   =>  $chapter->content,
             'sign_status'   =>  $chapter->sign_status,
-            //'is_need_subscirbe'   =>  $chapter->is_need_subscirbe,
+            'force_add_desk_type'   =>  $chapter->force_add_desk_type,
         ];
     }
 }