Merge branch 'kuaiyingyong' of iqiyoo:zhuishuyun_wap into kuaiyingyong

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

@@ -209,6 +209,10 @@ class BookController extends BaseController
             if(!$this->send_order_id || $this->send_order_id == 0 ){
                 \Log::info('un_send_order_book:uid:'.$this->uid);
                 $result = $this->getCheckBids($channel,$books,$package_id);
+                if(isset($result[1]['books']) && count((array)$result[1]['books']) > 1){
+                    return response()->success($result);
+                }
+                $result = $this->getCheckBids($channel,$books,0);
                 return response()->success($result);
             }else{
                 $package_id = 0;

app/Http/Controllers/QuickApp/Oauth/UsersController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\QuickApp\Oauth;
 
 use App\Consts\SysConsts;
+use App\Modules\User\Models\QappPackage;
+use App\Modules\User\Services\QappPackageService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Modules\User\Services\QappUserService;
@@ -54,12 +56,17 @@ class UsersController extends Controller
         $imei          = $request->input('imei', '');
         $mac           = $request->input('mac', '');
         $device_info   = $request->input('device_info', '');
-        if ($device_no) {
-            $origin_package = $package;
-            //FIXME 海天包传成浩瀚了，特殊处理下，这个名字就给海天用
-            if($package =='com.beidao.kuaiying.haohan'){
-                $package = 'com.beidao.kuaiying.haitian';
-            }
+        
+        $origin_package = $package;
+        //FIXME 海天包传成浩瀚了，特殊处理下，这个名字就给海天用
+        if($package =='com.beidao.kuaiying.haohan'){
+            $package = 'com.beidao.kuaiying.haitian';
+        }
+        
+        //获取渠道id
+        $channel_id = QappPackageService::getChannelId($package);
+        if ($device_no && $channel_id > 0) {
+
             \Log::info('$package:'.$package.' $origin_package:'.$origin_package.' $send_order_id:'.$send_order_id);
             $data = (new QappUserService)->login(compact('package', 'send_order_id', 'device_no', 'androidid', 'mac', 'device_info', 'imei', 'codeVersion'));
             if($data){
@@ -68,6 +75,7 @@ class UsersController extends Controller
                 return response()->error('PARAM_ERROR');
             }
         } else {
+            \Log::info('$package:'.$package.' $send_order_id:'.$send_order_id);
             return response()->error('PARAM_ERROR');
         }
     }

app/Http/Kernel.php

@@ -49,6 +49,7 @@ class Kernel extends HttpKernel
         'throttle'  => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'checkSign' => \App\Http\Middleware\CheckSign::class,
         'userstatus'=> \App\Http\Middleware\QuickAppUserStatus::class,
-        'userrefresh'=> \App\Http\Middleware\QuickAppUserInfoRefresh::class
+        'userrefresh'=> \App\Http\Middleware\QuickAppUserInfoRefresh::class,
+        'getPackage'=> \App\Http\Middleware\QuickAppGetPackage::class,
     ];
 }

app/Http/Middleware/QuickAppGetPackage.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Modules\User\Services\QappPackageService;
+use Closure;
+use Tymon\JWTAuth\Middleware\BaseMiddleware;
+
+class QuickAppGetPackage extends BaseMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // 获取头部信息
+        $package     = $request->header('x-package', '');
+        $channel_id = QappPackageService::getChannelId($package);
+        if($channel_id > 0){
+            return $next($request);
+        }else{
+            \Log::info('not_exists_package:'.$package. 'channel_id:'. $channel_id);
+            return response()->error('QAPP_SYS_ERROR');
+        }
+
+    }
+}

app/Http/Routes/QuickApp/QuickAppRoutes.php

@@ -19,7 +19,7 @@ Route::group(['domain' => env('QUICKAPP_DOMAIN'), 'namespace' => 'App\Http\Contr
     });
 
     // 无需登录的接口
-    Route::group(['prefix' => 'api'], function () {
+    Route::group(['prefix' => 'api', 'middleware' => 'getPackage'], function () {
 
         Route::middleware(['userrefresh'])->group(function (){
             // 首页
@@ -42,7 +42,7 @@ Route::group(['domain' => env('QUICKAPP_DOMAIN'), 'namespace' => 'App\Http\Contr
         Route::get('books/rank', 'Book\BookController@rank');
     });
 
-    Route::group(['prefix' => 'api', 'middleware' => 'jwttoken'], function () {
+    Route::group(['prefix' => 'api', 'middleware' => ['jwttoken','getPackage']], function () {
 
         Route::middleware(['userstatus'])->group(function (){
             //章节订购列表

app/Modules/User/Services/QappPackageService.php

@@ -14,4 +14,9 @@ class QappPackageService
     {
         return QappPackage::getPackage($channel_id);
     }
+
+    static function getChannelId($package)
+    {
+        return QappPackage::where('package',$package)->value('channel_id');
+    }
 }