a

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

@@ -210,6 +210,7 @@ class BookController extends BaseController
             }
         }
         $result = $this->getHomeDataFromDb($request, $sex);
+        return response()->success($result);
         if ($package == "com.beidao.kuaiying.hupoyuedu" && $sex == "male" && isset($user->uid) && !empty($user->uid) && ($user->send_order_id > 0 || $user->user->send_order_id > 0)) {
             $has_recharge = \App\Modules\Trade\Models\Order::where(['uid' => $user->uid, 'status' => "PAID"])->value('trade_no');
             if ($has_recharge) {
@@ -256,7 +257,6 @@ class BookController extends BaseController
             $package_id = 0;
         }
 
-        return BookAuditService::getYueaiHomeBooksData($sex, $package, $isAuth, 1,$package_id);
         if (Utils::checkIsAudit($package, $brand, $codeVersion) || $isAuth == false) {
             return BookAuditService::getHomeBooksData($sex, $package, $isAuth,$package_id);
         }
@@ -265,7 +265,7 @@ class BookController extends BaseController
 
             $orderRecord = ChapterOrderService::hasUserRecord($user->uid);
             if ($orderRecord) {
-                return BookAuditService::getYueaiHomeBooksData($sex, $package, $isAuth, 1);
+                return BookAuditService::getYueaiHomeBooksData($sex, $package, $isAuth, 1,$package_id);
             }
         }
 
@@ -286,7 +286,7 @@ class BookController extends BaseController
             $books = $banner[$sex];
         }
 
-
+        return BookAuditService::getHuPoHomeBooksData($channel, $books, $package_id, $package);
         if ($package == "com.beidao.kuaiying.hupoyuedu" && $sex == "male" && isset($user->uid) && !empty($user->uid) && ($user->send_order_id > 0 || $user->user->send_order_id > 0)) {
             $has_recharge = \App\Modules\Trade\Models\Order::where(['uid' => $user->uid, 'status' => "PAID"])->value('trade_no');
             if ($has_recharge) {

app/Modules/Book/Models/BookConfig.php

@@ -226,7 +226,7 @@ class BookConfig extends Model
             ->whereIn('book_configs.bid', $bid_arr);
 
         if($is_external_shelf) $res->where('is_on_shelf',2);// 默认外部上架
-
+        myLog('book')->info(implode(',',$bid_arr));
         if ($order) {
             $res->orderBy($order[0], $order[1]);
         } else {

app/Modules/Book/Services/BookAuditService.php

@@ -87,36 +87,15 @@ class BookAuditService
         // 模块
         [$hot, $live, $recom, $new] = [$home['hot'], $home['zhibo'], $home['recom'], $home['new_recom']];
         [$hotBids, $liveBids, $recomBids, $newBids] =  BookConfigService::HomePageRecomBookCheck($hot, $live, $recom, $new,$package_id, $package,$channel,false);
-        return [
-            [
-                'type'  => 'reco_banner',
-                'lable' => $banner['label'],
-                'books' => $bannerBooks
-            ],
-            [
-                'type'  => 'hot',
-                'lable' => $hot['label'],
-                'books' => collectionTransform(new BookTransformer, BookConfigService::getBooksByIds($hotBids,[],false)),
-            ],
-            [
-                'type'  => 'zhibo',
-                'lable' => $live['label'],
-                'books' => collectionTransform(new BookTransformer, BookConfigService::getBooksByIds($liveBids,[],false)),
-            ],
-            [
-                'type'  => 'recom',
-                'lable' => $recom['label'],
-                // 'books' => collectionTransform(new BookTransformer, collect($books)->whereIn('bid', $recomBids)->all())
-                 'books' => collectionTransform(new BookTransformer, BookConfigService::getBooksByIds($recomBids,[],false)),
 
-            ],
-            [
-                'type'  => 'new_recom',
-                'lable' => $new['label'],
-                // 'books' => collectionTransform(new BookTransformer, collect($books)->whereIn('bid', $newBids)->all())
-                'books' => collectionTransform(new BookTransformer, BookConfigService::getBooksByIds($newBids,[],false)),
-            ],
-        ];
+        return array_filter([
+            ['type' => 'reco_banner', 'lable' => '首页banner', 'books' => $bannerBooks],
+            ['type' => 'hot', 'lable' => '热门书单', 'books' => collectionTransform(new BookTransformer, BookConfigService::getBooksByIds($hotBids,['recommend_index','desc'],false))],
+            ['type' => 'zhibo', 'lable' => '神书直播', 'books' => collectionTransform(new BookTransformer, BookConfigService::getBooksByIds($liveBids,['recommend_index','desc'],false))],
+            ['type' => 'recom', 'lable' => '小编精选', 'books' => collectionTransform(new BookTransformer, BookConfigService::getBooksByIds($recomBids,['recommend_index','desc'],false))],
+            ['type' => 'new_recom', 'lable' => '人气新书', 'books' => collectionTransform(new BookTransformer, BookConfigService::getBooksByIds($newBids,['recommend_index','desc'],false))],
+        ]);
+
     }
 
     private static function getCheckBooks($bid_list,$channel,$package,$is_author)
@@ -179,8 +158,9 @@ class BookAuditService
         $isAuthor = check_qapp_auth($package_id,1);
         $hotBids   = [65741,65743,65742,65744,66474,66475];
         $liveBids  = [66476,66477,66479,66480,66631,61596];
-        $recomBids = BookConfigService::getCheckBooks(QappRecommendService::getRecommendByPacketId($channel, 'recom',$package_id),$channel,$package,$isAuthor);
-        $newBids   = BookConfigService::getCheckBooks(QappRecommendService::getRecommendByPacketId($channel, 'new_recom',$package_id),$channel,$package,$isAuthor);
+        $recomBids = QappRecommendService::getRecommendByPacketId($channel, 'recom',$package_id);
+        $newBids   = QappRecommendService::getRecommendByPacketId($channel, 'new_recom',$package_id);
+        [$hotBids, $liveBids, $recomBids, $newBids] =  BookConfigService::HomePageRecomBookCheck($hotBids, $liveBids, $recomBids, $newBids,$package_id, $package,$channel,false);
 
         return array_filter([
             ['type' => 'reco_banner', 'lable' => '首页banner', 'books' => $books],