Explorar o código

'修复书架展示问题'

zhuchengjie %!s(int64=2) %!d(string=hai) anos
pai
achega
76fa848293

+ 7 - 2
app/Http/Controllers/QuickApp/User/ReadRecordController.php

@@ -75,7 +75,7 @@ class ReadRecordController extends BaseController
         if ($res) {
             $bids = array_column($res,'bid');
             $channel_id = ($package === 'com.beidao.kuaiying.zsy') ? 7477 : 0;
-            $book = BookConfigService::getBookLists(compact('bids','channel_id'), [], false);//下架图书最近阅读可看到
+            $book = BookConfigService::getBooksByIds($bids, [], false);//下架图书最近阅读可看到
             foreach ($res as $key => &$value) {
                 $value['cover']        = '';
                 $value['last_chapter'] = 0;
@@ -92,7 +92,12 @@ class ReadRecordController extends BaseController
                         $value['status'] = $val->status;
                         $value['size'] = $val->size;
                         $value['author'] = $val->author;
-                        if(!$year_account &&  !in_array($val->is_on_shelf,[1,2]) ){
+                        if($channel_id === 7477){
+                            $hidden = array_merge(getHiddenCp(),['lianshang']);
+                        }else{
+                            $hidden = getHiddenCp();
+                        }
+                        if((!$year_account && !in_array($val->is_on_shelf,[1,2])) || in_array($val->cp_source,$hidden)){
                             //获取书籍充值类型
                             $charge_type = $val->charge_type;
                             if($charge_type == 'BOOK'){

+ 1 - 1
app/Modules/Book/Models/BookConfig.php

@@ -196,6 +196,7 @@ class BookConfig extends Model
                 'book_configs.copyright',
                 'book_configs.charge_type',
                 'book_configs.is_on_shelf',
+                'book_configs.cp_source',
                 'books.author',
                 'books.intro',
                 'book_categories.category_name',
@@ -232,7 +233,6 @@ class BookConfig extends Model
             $field = 'bid,' . $str;
             $res->orderBy(DB::raw('field(' . $field . ')'));
         }
-        $res->whereNotIn('book_configs.cp_source',getHiddenCp());
 
         return $res->limit(30)->get();
     }