|
@@ -26,6 +26,8 @@ use App\Modules\UserTask\Services\UserTaskService;
|
|
|
class ChapterController extends BaseController
|
|
|
{
|
|
|
|
|
|
+ private $book_info;
|
|
|
+
|
|
|
/**
|
|
|
* @apiDefine Chapter 章节
|
|
|
*/
|
|
@@ -260,6 +262,7 @@ class ChapterController extends BaseController
|
|
|
$book_info = BookConfigService::getBookById($bid);
|
|
|
if (empty($book_info))
|
|
|
return response()->error('QAPP_SYS_ERROR');
|
|
|
+ $this->book_info = $book_info;
|
|
|
//获取章节信息
|
|
|
$chapter = ChapterService::getChapterNameById($cid, $bid);
|
|
|
if (!$chapter) {
|
|
@@ -693,10 +696,15 @@ class ChapterController extends BaseController
|
|
|
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->book_id == $bid && $send_order_info->force_add_desk_type && $send_order_info->force_add_desk_seq){
|
|
|
- if($sequence >= $send_order_info->force_add_desk_seq){
|
|
|
+ if($send_order_info->book_id == $bid){
|
|
|
+ if($send_order_info->force_add_desk_type == 1 && $send_order_info->force_add_desk_type){
|
|
|
$force_add_desk_type = $send_order_info->force_add_desk_type;
|
|
|
}
|
|
|
+ if($send_order_info->force_add_desk_type == 2){
|
|
|
+ if($sequence >= $this->book_info->force_subscribe_chapter_seq && $sequence<= $this->book_info->force_subscribe_chapter_seq+3){
|
|
|
+ $force_add_desk_type = $send_order_info->force_add_desk_type;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return $force_add_desk_type;
|
|
|
}
|