Merge branch 'master' of iqiyoo:zhuishuyun_wap

app/Console/Commands/BookTest.php

@@ -6,6 +6,8 @@ use App\Modules\Book\Services\BookSubscribleChapterService;
 use App\Modules\Subscribe\Services\ChapterOrderService;
 use App\Modules\YunQi\Models\BookUser;
 use App\Modules\YunQi\Models\YqUserBidRelation;
+use App\Modules\YunQi\Models\YqZsyTest;
+use App\Modules\YunQi\Services\YqZsyTestService;
 use GuzzleHttp\Client;
 use Illuminate\Console\Command;
 
@@ -372,6 +374,8 @@ class BookTest extends Command
             if($from_bids){
                 foreach ($from_bids as $from_bid){
                     $bid = $from_bid->from_bid;
+                    $test = YqZsyTestService::getByBid($bid);
+                    if($test) continue;
                     $time = $from_bid->created_at->format('Y-m-d H:i:s');
                     $fee = $chapter_model->where('uid',$item->uid)
                         ->where('bid',$bid)

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Wap\Book;
 
 use App\Modules\Book\Models\BookSearchStat;
 use App\Modules\Book\Services\BookSearchStatService;
+use App\Modules\Book\Services\BookUrgeUpdateService;
 use App\Modules\RecommendBook\Services\RecommendService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Wap\BaseController;
@@ -546,7 +547,21 @@ class BookController extends BaseController
         $bid = Hashids::decode($bid)[0];
         $book_info = BookConfigService::getBookById($bid);
         $res = BookConfigService::getRecommendBooks($bid,$book_info->channel_name);
-        return response()->collection(new BookTransformer(),$res);
+        $urge_status = 0;
+        if($book_info->status == 0 && !BookUrgeUpdateService::isHadUrged($this->uid,$bid)){
+            $urge_status = 1;
+        }
+        $recommend_result = collectionTransform(new BookTransformer(),$res);
+        $book_status = [
+            'status'=>$book_info->status,
+            'urge_status'=>$urge_status
+        ];
+        $data = [
+            'recommend_result'=>$recommend_result,
+            'book_status'=>$book_status
+        ];
+        //return response()->collection(new BookTransformer(),$res);
+        return response()->success($data);
     }
     
     /**

app/Http/Controllers/Wap/Book/ChapterController.php

@@ -13,6 +13,7 @@ use App\Modules\Statistic\Services\DataAnalysisChapterService;
 use App\Modules\Statistic\Services\DataAnalysisSelectUserService;
 use App\Modules\Statistic\Services\WapVisitStatService;
 use App\Modules\Subscribe\Services\OrderService;
+use App\Modules\User\Services\ReadRecordStatsService;
 use App\Modules\YunQi\Services\BookUserService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Wap\BaseController;
@@ -629,6 +630,8 @@ class ChapterController extends BaseController
         $this->share();
         //广告
         $this->isShowAd();
+        //完整阅读纪录 阅读纪录
+        $this->readRecordOther();
     }
 
     /**
@@ -1203,7 +1206,14 @@ class ChapterController extends BaseController
 
     private function readRecordOther()
     {
-        $chapter = $this->chapter;
+        $bid = $this->book_info->bid;
+        $cid = $this->cid;
+        $distribution_channel_id = $this->distribution_channel_id;
+        $send_order_id = $this->send_order_id;
+        $from = $this->from_type;
+        $sequence = $this->chapter->sequence;
+        ReadRecordStatsService::record($this->uid,$bid,$cid,$distribution_channel_id,$send_order_id,$from,$sequence);
+        /*$chapter = $this->chapter;
         try {
             $data = [];
             $data['uid'] = $this->uid;
@@ -1216,7 +1226,7 @@ class ChapterController extends BaseController
             DB::table('read_records')->insert($data);
         } catch (\Exception  $e) {
 
-        }
+        }*/
 
     }
 

app/Http/Controllers/Wap/Help/HelpController.php

@@ -14,7 +14,7 @@ class HelpController extends Controller
     {
         $lists = HelpService::getEnableHelpList();
         $distribution_channel_id = $request->get('distribution_channel_id', 0);
-        $qrcode = 'https://cdn-novel.iycdm.com/static/img/kefu20180724.jpg';
+        $qrcode = 'https://cdn-novel.iycdm.com/static/img/kefu20190128.jpg';
         if ($distribution_channel_id) {
 
             if(!is_numeric($distribution_channel_id)){

app/Http/Controllers/Wap/User/UserController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Wap\User;
 
+use App\Modules\Book\Services\BookUrgeUpdateService;
 use App\Modules\Statistic\Services\AdVisitStatService;
 use App\Modules\Subscribe\Services\OrderService;
 use App\Modules\User\Services\ReadRecordService;
@@ -253,6 +254,20 @@ class UserController extends BaseController
         return response()->success();
     }
 
+    public function urgeUpdate(Request $request){
+        $bid = $request->get('bid');
+        if(!$bid){
+            return response()->error('PARAM_ERROR');
+        }
+        $bid = Hashids::decode($bid)[0];
+
+        $result = BookUrgeUpdateService::UrgeRecord($this->uid,$bid);
+        if($result && !$result->id){
+            BookUrgeUpdateService::UrgeUpdate($this->uid,$bid,$result->updated_at);
+        }
+        return response()->success();
+    }
+
     function logout()
     {
         setcookie(env('COOKIE_AUTH_WEB_WECHAT'), '', -1);
@@ -260,12 +275,12 @@ class UserController extends BaseController
         return response('logout');
     }
     
-    function test_add_user_login_cookie(Request $request)
+    function test_add_user_login_cookie(Request $request)
     {
     	$uid = $request->get('uid');
-    	\Log::info('test_add_user_login_cookie:'.$uid);
-    	Cookie::queue(env('COOKIE_AUTH_WEB_WECHAT'), $uid, env('U_COOKIE_EXPIRE'), null, null, false, false);
-    	return response('add_cookie:'.$uid);
+    	\Log::info('test_add_user_login_cookie:'.$uid);
+    	Cookie::queue(env('COOKIE_AUTH_WEB_WECHAT'), $uid, env('U_COOKIE_EXPIRE'), null, null, false, false);
+    	return response('add_cookie:'.$uid);
     }
     
 }

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -395,7 +395,7 @@ class WelcomeController extends BaseController
         if ($setting && $setting->customer_img_url) {
             $customer_service = $setting->customer_img_url;
         } else {
-            $customer_service = "https://cdn-novel.iycdm.com/static/img/kefu20180724.jpg";
+            $customer_service = "https://cdn-novel.iycdm.com/static/img/kefu20190128.jpg";
         }
         return $customer_service;
     }

app/Http/Routes/Wap/WapRoutes.php

@@ -99,7 +99,9 @@ Route::group(['domain'=>env('WAP_DOMAIN'),'namespace'=>'App\Http\Controllers\Wap
         //签到记录
         Route::get('user/sign_record','User\UserController@signRecord');
         Route::get('user/sign','User\UserController@sign');
-        
+        //催更
+        Route::get('user/urgeUpdate','User\UserController@urgeUpdate');
+
         // 测试登录
 //         Route::any('user/test_add_user_login_cookie','User\UserController@test_add_user_login_cookie');
         

app/Libs/Helpers.php

@@ -415,7 +415,7 @@ function get_client_ip($type = 0, $adv = false)
 //授权两次
 function specialChannelAuthInfo(){
     return [
-        '4404'=>'wx939e8ff1b572aa49',
+        '4404'=>'wx1d618e3cf988e2e6',
         '4395'=>'wx5135dcdbb6043872',
         '4396'=>'wx8f365ca550b8bf3c',
         '4397'=>'wx83b5939831c13515',
@@ -431,13 +431,13 @@ function specialChannelAuthInfo(){
         '4414'=>'wx2983fdb0e80431ba',
         '4415'=>'wx4876d3c9ccd07ad6',
         '4416'=>'wx7e51e2825f5aad16',
-        '4433'=>'wx274eb60e7a1fc953',
-        '4434'=>'wx7e06ff61885e50bb',
+        //'4433'=>'wx274eb60e7a1fc953',
+        //'4434'=>'wx7e06ff61885e50bb',
         '4435'=>'wxe3035fd2e77b7cc8',
         '4436'=>'wx79dbfc1ed7397c28',
-        '4438'=>'wx7af4f5ee84c8b097',
+        //'4438'=>'wx7af4f5ee84c8b097',
         '4439'=>'wx0789cce3a1699ce8',
-        '4440'=>'wx7f8907c009d3908d',
+        //'4440'=>'wx7f8907c009d3908d',
         '4441'=>'wx01f9731df15a7888',
         '4442'=>'wxb7192d7171ffa3c4',
         '4443'=>'wx3355f5be92b92350',
@@ -448,7 +448,8 @@ function specialChannelAuthInfo(){
         '928'=>'wx76da3531773c1f39',
         '157'=>'wx5ebe6187c0fb0bd5',
         '4175'=>'wx64cf3051ceb145ae',
-        '4217'=>'wxdb15f8db194bf6f4'
+        '4217'=>'wxdb15f8db194bf6f4',
+        '4604'=>'wxc177995c55b5e75e'
     ];
 }
 
@@ -472,6 +473,13 @@ function specialChannelAuthInfoV2(){
         '4624'=>'wx552c4500db26c627',
         '4658'=>'wx680b1e557a2e811d',
         '4666'=>'wx8136bdaa80a6dda0',
-        '4667'=>'wx26608e6bb0705656'
+        '4667'=>'wx26608e6bb0705656',
+        '4763'=>'wxdd100beddec262c9',
+        '4779'=>'wx6f9cd0fcb96d9d9d',
+        '4778'=>'wx4e1d53afd5e73b33',
+        '4433'=>'wx449a65a9bbc7d50a',
+        '4434'=>'wx7ea67b55ac102fd3',
+        '4440'=>'wxddd622a5c195a3a9',
+        '4438'=>'wx007ef65244b47f7c'
     ];
 }

app/Modules/Book/Models/BookUrgeUpdate.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Modules\Book\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BookUrgeUpdate extends Model
+{
+    protected  $table = 'book_urge_update';
+
+    protected $fillable = ['uid','bid','last_update_time'];
+}

app/Modules/Book/Services/BookUrgeUpdateService.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: z-yang
+ * Date: 2019/1/29
+ * Time: 17:26
+ */
+
+namespace App\Modules\Book\Services;
+
+use App\Modules\Book\Models\BookUrgeUpdate;
+use DB;
+
+class BookUrgeUpdateService
+{
+
+    public static function UrgeRecord($uid,$bid){
+        return  BookUrgeUpdate::rightJoin('books',function ($join)use($uid){
+            $join->on('books.id','=','book_urge_update.bid')
+                ->where('book_urge_update.uid','=',$uid)
+                ->whereColumn('book_urge_update.created_at','>','books.updated_at');
+                })
+            ->select('books.updated_at','book_urge_update.id')
+            ->where('books.id',$bid)
+            ->first();
+    }
+
+
+    public static function isHadUrged($uid,$bid){
+        $result = self::UrgeRecord($uid,$bid);
+        if($result && $result->id){
+            return true;
+        }
+        return false;
+    }
+
+    public static function UrgeUpdate($uid,$bid,$time){
+        $data = [
+            'uid'=>$uid,
+            'bid'=>$bid,
+            'last_update_time'=>$time
+        ];
+        return BookUrgeUpdate::create($data);
+    }
+
+    public static function getUrgeUpdateRecord(){
+        return BookUrgeUpdate::join('book_configs','book_urge_update.bid','=','book_configs.bid')
+            ->select(DB::raw('count(*) as uv,book_urge_update.bid,book_urge_update.last_update_time'),'book_configs.book_name')
+            ->orderBy('book_urge_update.last_update_time','desc')
+            ->groupBy('book_urge_update.last_update_time')
+            ->groupBy('book_urge_update.bid')
+            ->paginate(30);
+    }
+}

app/Modules/User/Services/ReadRecordStatsService.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: z-yang
+ * Date: 2019/1/28
+ * Time: 16:22
+ */
+
+namespace App\Modules\User\Services;
+
+use Redis;
+
+class ReadRecordStatsService
+{
+    public static function record($uid,$bid,$cid,$distribution_channel_id,$send_order_id,$from,$sequence){
+        $data = compact('uid', 'bid','cid','distribution_channel_id','send_order_id','from','sequence');
+        $data['created_at'] = $data['updated_at'] = date('Y-m-d H:i:s');
+        $data['attach'] = '';
+        try{
+            Redis::lpush('ReadRecordStats',json_encode($data));
+        }catch (\Exception $e){}
+    }
+
+}

resources/views/wap-browser/subscribe.blade.php

@@ -134,7 +134,7 @@
         });
     }
 </script>
-<script src={{asset('/wapbrowser/web/qrcode.min.js')}}></script>
+<script src='https://cdn-novel.iycdm.com/static/qrcode.min.js'></script>
 <script>
 
         var img_url = "{!! $url !!}"