Merge branch 'dev-xpy' into dev

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

@@ -229,7 +229,7 @@ class Jd extends BaseController
         }
         shuffle($formatList);
         $uid = $uid ?? 0;
-        $repository->sproductkeywordHistory($uid, 1, 1, '用户同意用户协议记录');
+        $repository->sproductkeywordHistory($uid, $keyword, 2);
         return app("json")->success($formatList);
     }
 

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

@@ -3,6 +3,7 @@
 namespace app\controller\api\store\product;
 
 use app\common\repositories\store\product\ProductRepository;
+use app\common\repositories\user\UserRepository;
 use app\common\repositories\user\UserThirdRepository;
 use app\model\common\SuOrderModel;
 use app\model\common\TbOrderModel;
@@ -239,7 +240,7 @@ class Su extends BaseController
     }
 
     // 数据库查询列表
-    public function GoodList()
+    public function GoodList(UserRepository $repository)
     {
         [$page, $limit] = $this->getPage();
 
@@ -286,7 +287,7 @@ class Su extends BaseController
             }
         }
         $uid = $uid ?? 0;
-        //app('app\controller\api\User')->sproductkeywordHistory($uid, $keyword, 3);
+        $repository->sproductkeywordHistory($uid, $keyword, 4);
         return app('json')->success('获取苏宁商品列表成功', $goodslist);
     }
 

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

@@ -4,6 +4,7 @@ namespace app\controller\api\store\product;
 
 use app\common\model\user\UserThird;
 use app\common\repositories\store\product\ProductRepository;
+use app\common\repositories\user\UserRepository;
 use app\common\repositories\user\UserThirdRepository;
 use app\model\common\PddOrderModel;
 use crmeb\services\JwtTokenService;
@@ -127,7 +128,7 @@ class TaoKe extends BaseController
 
 
     //拼多多商品列表
-    public function pdd_list()
+    public function pdd_list(UserRepository $repository)
     {
         $keyword=input('keyword','');
         $cat_id = input('cat_id','');
@@ -279,7 +280,7 @@ class TaoKe extends BaseController
         
         shuffle($goodsList);
         $uid = $uid ?? 0;
-        //app('app\controller\api\User')->sproductkeywordHistory($uid, $keyword, 3);
+        $repository->sproductkeywordHistory($uid, $keyword, 3);
         return app('json')->success('获取拼多多商品列表成功', $goodsList);
     }
 

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

@@ -291,7 +291,7 @@ class Vip extends BaseController
     }
 
     // 数据库获取列表
-    public function vip_goods()
+    public function vip_goods(UserRepository $repository)
     {
         [$page, $limit] = $this->getPage();
 
@@ -341,7 +341,7 @@ class Vip extends BaseController
             }
         }
         $uid = $uid ?? 0;
-        //('app\controller\api\User')->($uid, $keyword, 3);
+        $repository->sproductkeywordHistory($uid, $keyword, 5);
         return app('json')->success('获取唯品会商品列表成功', $goodslist);
     }