Merge branch 'kuaiyingyong' of iqiyoo:zhuishuyun_wap into kuaiyingyong

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

@@ -581,13 +581,34 @@ class BookController extends BaseController
      */
     public function recommenYueAi()
     {
-        $data = config('home.yueai');
-        $books = $data['task_banner'];
-        foreach ($books as  &$value){
-            $value['bid'] =Hashids::encode($value['bid']);
-            $value['redirect_url '] = empty($value['cid']) ? "views/Detail" :  "views/Reader";
+        $user =  (new QappUserService)->getGolableUser();
+        if(isset($user->uid) && !empty($user->uid) && $user->send_order_id >  0){
+            $orderRecord = ChapterOrderService::hasUserRecord($user->uid);
+            if($orderRecord){
+                $data = config('home.yueai');
+                $books = $data['task_banner'];
+                foreach ($books as  &$value){
+                    $value['bid'] =Hashids::encode($value['bid']);
+                    $value['redirect_url '] = empty($value['cid']) ? "views/Detail" :  "views/Reader";
+                }
+                unset($value);
+                return response()->success($books);
+            }
         }
-        unset($value);
+
+        $reco_banner_type = ['FEMALE', 'PUBLIC'];
+        $books            = (new RecoBannerService)->getByType($reco_banner_type, 2);
+        $books->transform(function ($item) {
+            $result    = $this->getBidCidFromUrl($item->redirect_url);
+            $item->bid = $result['bid'];
+            $item->cid = $result['cid'];
+            if ($result['cid']) {
+                $item->redirect_url = "views/Reader";
+            } else {
+                $item->redirect_url = "views/Detail";
+            }
+            return $item;
+        });
         return response()->success($books);
     }
 

app/Modules/Report/Services/ReportService.php

@@ -53,13 +53,13 @@ class ReportService
         // 判断是否是次留回传
         if ($registerYmd === $activeYmd && $todayYmd === $registerNextYmd) {
             myLog('reportSActive')->info('', compact('uid', 'registerYmd'));
-            self::report('/api/reportSActive', [
-                'uid'           => getProp($userCache, 'uid'),
-                'channel_id'    => getProp($userCache, 'channel_id'),
-                'register_time' => getProp($userCache, 'register_time'),
-                'active_time'   => getProp($userCache, 'active_time'),
-                'platform'      => 'zhuishuyun',
-            ]);
+//            self::report('/api/reportSActive', [
+//                'uid'           => getProp($userCache, 'uid'),
+//                'channel_id'    => getProp($userCache, 'channel_id'),
+//                'register_time' => getProp($userCache, 'register_time'),
+//                'active_time'   => getProp($userCache, 'active_time'),
+//                'platform'      => 'zhuishuyun',
+//            ]);
         }
 
         // 更新用户活跃时间