Merge branch 'kuaiyingyong' into kuaiyingyong_wcc

app/Http/Controllers/QuickApp/User/ReadRecordController.php

@@ -65,8 +65,7 @@ class ReadRecordController extends BaseController
     public function index(Request $request)
     {
         $user = $this->user_info;
-        $is_check_from_db = (time() - strtotime($user->created_at) > 5 * 30 * SysConsts::ONE_DAY_SECONDS);
-        $res = ReadRecordService::getReadRecord($this->uid, $is_check_from_db);
+        $res = ReadRecordService::getReadRecord($this->uid);
         if ($res) {
             $id_arr = [];
             foreach ($res as $key => $value) {
@@ -79,39 +78,19 @@ class ReadRecordController extends BaseController
                 $value['last_chapter'] = 0;
                 foreach ($book as  $val) {
                     if ($value['bid'] == $val->bid) {
+                        $value['book_name'] = $val->book_name;
                         $value['cover'] = $val->cover;
                         $value['last_chapter'] = $val->last_chapter;
                         break;
                     }
                 }
             }
-
-            $shelf = UserShelfBooksService::getUserShelfBooksListByUid($this->uid);
-            foreach ($res as &$v) {
-                $v['is_on_user_shelf'] = 0;
-                foreach ($shelf as $val) {
-                    if ($v['bid'] == $val->bid) {
-                        $v['is_on_user_shelf'] = 1;
-                        break;
-                    }
-                }
-            }
         }
         usort($res, function ($a, $b) {
             if ($a['time'] >= $b['time']) return -1;
             return 1;
         });
-        $res = json_encode($res);
-        $res = json_decode($res);
-        foreach ($res as $key => &$each) {
-            $rec = ShareUsersService::getUnlocked($this->uid, $each->bid);
-            if ($rec) {
-                $each->is_advertise_sub = 1;
-            } else {
-                $each->is_advertise_sub = 0;
-            }
-        }
-        return response()->collection(new ReadRecordTransformer(), $res);
+        return response()->collection(new ReadRecordTransformer(),  array_to_object($res));
     }
 
 

app/Http/Controllers/QuickApp/User/Transformers/ReadRecordTransformer.php

@@ -9,15 +9,13 @@ class ReadRecordTransformer
     public function transform($res)
     {
         return [
-            'bid' => Hashids::encode($res->bid),
+            'book_id' => Hashids::encode($res->bid),
             'cid' => $res->cid,
             'book_name' => $res->book_name,
             'chapter_name' => $res->chapter_name,
             'time' => $res->time,
             'cover' => $res->cover,
-            'last_chapter' => $res->last_chapter,
-            'is_on_user_shelf' => $res->is_on_user_shelf,
-            'is_advertise_sub' => isset($res->is_advertise_sub) ? $res->is_advertise_sub : 0
+            'last_chapter' => $res->last_chapter
         ];
     }
 }

app/Http/Controllers/QuickApp/User/UserShelfBooksController.php

@@ -61,6 +61,7 @@ class UserShelfBooksController extends BaseController
      */
     public function addShelf(Request $request)
     {
+        return response()->success();
         $param = $request->except('_url');
         if (checkParam($param, ['bid'])) {
             return response()->error('LACK_PARAM');