Merge branch 'kuaiyingyong' into kuaiyingyong_wcc

# Conflicts:
#	app/Http/Controllers/QuickApp/Activity/ActivityController.php
#	app/Http/Controllers/QuickApp/Activity/Transformers/ReBuildData.php

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

@@ -212,6 +212,10 @@ class BookController extends BaseController
             }
         }
         $key = $request->input('key');
+        $uid = $request->input('uid', 0);
+        if ($key && $uid) {
+            BookConfigService::saveUserSearchLog($key, $uid);
+        }
         $where['key'] = $key;
         $order_field = $request->input('order_field');
         $order_seq = $request->input('order_seq');

app/Modules/Book/Models/QappUserSearchBookLog.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Modules\Book\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class QappUserSearchBookLog extends Model
+{
+    protected $table = 'qapp_user_search_word_log';
+    protected $fillable = [
+        'uid',
+        'words',
+    ];
+}

app/Modules/Book/Services/BookConfigService.php

@@ -14,6 +14,7 @@ use App\Modules\Book\Models\BookConfig;
 use App\Modules\Product\Services\ProductService;
 use App\Modules\Book\Models\Book;
 use App\Modules\Book\Models\BookKeyword;
+use App\Modules\Book\Models\QappUserSearchBookLog;
 use Redis;
 use DB;
 
@@ -456,4 +457,12 @@ class BookConfigService
             return $sql->paginate(10);
         }
     }
+
+    public static function saveUserSearchLog(string $words, int $uid)
+    {
+        QappUserSearchBookLog::create([
+            'uid' => $uid,
+            'words' => $words,
+        ]);
+    }
 }