|
@@ -696,7 +696,7 @@ class BookController extends BaseController
|
|
{
|
|
{
|
|
$where = [];
|
|
$where = [];
|
|
$order = [];
|
|
$order = [];
|
|
- $where['is_on_shelf'] = [2,4,7];
|
|
|
|
|
|
+ $where['is_on_shelf'] = [2,4];
|
|
$category_id = $request->input('category_id');
|
|
$category_id = $request->input('category_id');
|
|
if ($category_id) {
|
|
if ($category_id) {
|
|
if ($category_id == 1) {
|
|
if ($category_id == 1) {
|
|
@@ -754,7 +754,14 @@ class BookController extends BaseController
|
|
$page_size = $request->input('page_size', 15);
|
|
$page_size = $request->input('page_size', 15);
|
|
$where['channel_id'] = ($package === 'com.beidao.kuaiying.zsy') ? 7477 : 0;
|
|
$where['channel_id'] = ($package === 'com.beidao.kuaiying.zsy') ? 7477 : 0;
|
|
$books = BookConfigService::getBooks($where, $order, $page_size);
|
|
$books = BookConfigService::getBooks($where, $order, $page_size);
|
|
|
|
+ $special = get_special_bid();
|
|
|
|
+ $list = [];
|
|
|
|
+ foreach ($books as $ke => $val){
|
|
|
|
+ if ($val->is_on_shelf != 2 && !in_array($val->bid,$special)){
|
|
|
|
+ unset($books[$ke]);
|
|
|
|
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return response()->pagination(new BookTransformer,$books);
|
|
return response()->pagination(new BookTransformer,$books);
|
|
}
|
|
}
|
|
|
|
|