Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -4493,5 +4493,19 @@ class UserRepository extends BaseRepository
             'operation_time' => date('Y-m-d H:i:s')
         ]);
     }
+    /**
+     * 保存用户搜索商品关键字
+     * @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,
+        ]);
+    }
 
 }

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

@@ -13,6 +13,7 @@ use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
 use think\facade\Log;
+use app\common\repositories\user\UserRepository;
 
 class Jd extends BaseController
 {
@@ -155,7 +156,7 @@ class Jd extends BaseController
     }
 
     /*京粉精选商品查询接口*/
-    public function jdList()
+    public function jdList(UserRepository $repository)
     {
         $keyword = request()->param('keyword', '');
         $_cid = request()->param('cid', '');
@@ -228,7 +229,7 @@ class Jd extends BaseController
         }
         shuffle($formatList);
         $uid = $uid ?? 0;
-        app('app\controller\api\User')->sproductkeywordHistory($uid, $keyword, 2);
+        $repository->sproductkeywordHistory($uid, 1, 1, '用户同意用户协议记录');
         return app("json")->success($formatList);
     }
 

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

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

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

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

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

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

app/controller/api/user/User.php

@@ -877,20 +877,7 @@ 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,
-        ]);
-    }
+
 
     /**
      * 签到  获取积分