Merge branch 'stabble' of iqiyoo:zhuishuyun_wap into stabble

app/Modules/Book/Models/BookConfig.php

@@ -2,6 +2,7 @@
 
 namespace App\Modules\Book\Models;
 
+use App\Modules\Book\Services\BookRoleService;
 use App\Modules\Book\Services\BookTagsService;
 use App\Modules\User\Services\ReadRecordService;
 use App\Modules\Book\Services\BookConfigService;
@@ -70,7 +71,14 @@ class BookConfig extends Model
                 //关键词查询
                 if ($key == 'key' && $v) {
 
-                    $res = $res->where('book_configs.book_name', 'like', '%' . $v . '%');
+                    //$res = $res->where('book_configs.book_name', 'like', '%' . $v . '%');
+                    $res = $res->where(function ($query) use ($v) {
+                        $query->where('book_configs.book_name', 'like', '%' . $v . '%');
+                            $roles_bids = BookRoleService::getBidsByRole($v);
+                            if(count($roles_bids)>0) {
+                                $query->orWhereIn('book_configs.bid',$roles_bids);
+                            }
+                    });
                     //->orWhere('books.intro', 'like', '%' . $v . '%')
                     //->orWhere('books.category_name', 'like', '%' . $v . '%')->orWhere('books.author', 'like', '%' . $v . '%')
                     //->orWhere('books.keyword', 'like', '%' . $v . '%');

app/Modules/Book/Models/BookRoles.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Modules\Book\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BookRoles extends Model
+{
+    protected $table = 'book_roles';
+    protected $fillable = ['bid','role'];
+
+    public static function getRolesByBid($bid) {
+        return self::where('bid',$bid)->get();
+    }
+
+    public static function getBidsByRole($role) {
+        return self::where('role',$role)->select('bid')->get()->pluck('bid')->all();
+    }
+    public static function  getById($id){
+        return self::where('id',$id)->first();
+    }
+}

app/Modules/Book/Services/BookRoleService.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tandunzhao
+ * Date: 2017/12/4
+ * Time: 上午11:49
+ */
+
+namespace App\Modules\Book\Services;
+
+use App\Modules\Book\Models\BookGifts;
+use App\Modules\Book\Models\BookGiftsSend;
+use App\Modules\Book\Models\BookRoles;
+use App\Modules\BookGifts\Models\BookGiftsStatsByBook;
+use App\Modules\BookGifts\Models\BookGiftsStatsByGift;
+use App\Modules\User\Services\UserService;
+use DB;
+use Redis;
+
+class BookRoleService
+{
+
+    public static function getRolesByBid($bid) {
+        return BookRoles::getRolesByBid($bid);
+    }
+
+    public static function getBidsByRole($role) {
+        return BookRoles::getBidsByRole($role);
+    }
+
+    public static function getById($id) {
+        return BookRoles::getById($id);
+    }
+}