Merge branch 'dev' into dev-sxb

app/controller/admin/user/User.php

@@ -1979,4 +1979,15 @@ class User extends BaseController
             ->toArray();
         return app('json')->success('查询成功', $userData);
     }
+    /**
+     * 获取用户操作记录
+     */
+    public function getOperatingRecordList(){
+        $records = Db::name('user_operating_record')
+            ->order('create_time DESC') // 按创建时间倒序，可根据需求改
+            ->select()
+            ->toArray();
+        return app('json')->success($records, '获取成功');
+    }
+
 }

app/controller/api/store/product/Jd.php

@@ -227,6 +227,8 @@ class Jd extends BaseController
             $formatList[] = $json;
         }
         shuffle($formatList);
+        $uid = $uid ?? 0;
+        app('app\controller\api\User')->sproductkeywordHistory($uid, $keyword, 2);
         return app("json")->success($formatList);
     }
 

app/controller/api/store/product/Su.php

@@ -285,6 +285,8 @@ class Su extends BaseController
 
             }
         }
+        $uid = $uid ?? 0;
+        app('app\controller\api\User')->sproductkeywordHistory($uid, $keyword, 3);
         return app('json')->success('获取苏宁商品列表成功', $goodslist);
     }
 

app/controller/api/store/product/TaoKe.php

@@ -278,6 +278,8 @@ class TaoKe extends BaseController
         }
         
         shuffle($goodsList);
+        $uid = $uid ?? 0;
+        app('app\controller\api\User')->sproductkeywordHistory($uid, $keyword, 3);
         return app('json')->success('获取拼多多商品列表成功', $goodsList);
     }
 

app/controller/api/store/product/Vip.php

@@ -340,6 +340,8 @@ class Vip extends BaseController
                 $goodslist[] = $json;
             }
         }
+        $uid = $uid ?? 0;
+        app('app\controller\api\User')->sproductkeywordHistory($uid, $keyword, 3);
         return app('json')->success('获取唯品会商品列表成功', $goodslist);
     }
 

app/controller/api/user/User.php

@@ -877,6 +877,20 @@ class User extends BaseController
             return app('json')->fail('删除失败');
         }
     }
+    /**
+     * 保存用户搜索商品关键字
+     * @param $uid
+     * @param $keyword
+     * @param $type
+     * @return void
+     */
+    public function sproductkeywordHistory($uid, $keyword, $type){
+        Db::name('third_history')->insert([
+            'uid' => $uid,
+            'keyword' => $keyword,
+            'type' => $type,
+        ]);
+    }
 
     /**
      * 签到  获取积分

route/admin.php

@@ -403,6 +403,8 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::post('getImAdmin', '/getImAdmin')->name('getImAdmin');
 
             Route::get('enterpriseUserScoreApi', '/enterpriseUserScoreApi')->name('enterpriseUserScoreApi');
+            //获取用户操作记录
+            Route::get('getOperatingRecordList', '/getOperatingRecordList')->name('getOperatingRecordList');