Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -4503,6 +4503,20 @@ 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/admin/user/User.php

@@ -1984,7 +1984,10 @@ class User extends BaseController
      */
     public function getOperatingRecordList(){
         $records = Db::name('user_operating_record')
-            ->order('create_time DESC') // 按创建时间倒序，可根据需求改
+            ->alias('r')
+            ->join('user u', 'r.uid = u.uid', 'LEFT')
+            ->field('r.*, u.phone,u.nickname')
+            ->order('create_time DESC')
             ->select()
             ->toArray();
         return app('json')->success($records, '获取成功');

app/controller/api/store/merchant/Taskorderguquan.php

@@ -29,14 +29,14 @@ class Taskorderguquan
         13521438652徐立苹400
         15832971815孟晓玮300
         18600200909陈冠霖300
-        15810064711 王   玲 300
-        13932925303会强300
-        13901074090陈玉刚300
+        15810064711 王   玲 400
+        13932925303会强400
+        13901074090陈玉刚400
         13381085923王建军100
         13601071082隋彩云300
         18001316701闫旭300
         13601179856陈瑞元50
-        13161909228刘银霞100
+        13161909228刘银霞50
         18760167163刘春梅100
         13215917919李小秋100
         13801358713金波50
@@ -44,8 +44,11 @@ class Taskorderguquan
         15332507711张传莲50
         15960349667吕丽娣50
         13231658486周军市场补贴500
+        18513005403王培50
         18612051372李金俭 50
         15803242611王志敏50
+        13701059062王金权50
+        13331043787张吉良126
         18715313601大饼400
         */
         $data = [
@@ -59,22 +62,25 @@ class Taskorderguquan
             '13521438652' => 400,
             '15832971815' => 300,
             '18600200909' => 300,
-            '15810064711' => 300,
-            '13932925303' => 300,
-            '13901074090' => 300,
+            '15810064711' => 400,
+            '13932925303' => 400,
+            '13901074090' => 400,
             '13381085923' => 100,
             '13601071082' => 300,
             '18001316701' => 300,
             '13601179856' => 50,
-            '13161909228' => 100,
+            '13161909228' => 50,
             '18760167163' => 100,
             '13215917919' => 100,
             '13801358713' => 50,
             '15321221558' => 200,
             '15332507711' => 50,
             '15960349667' => 50,
+            '18513005403' => 50,
             '18612051372' => 50,
             '15803242611' => 50,
+            '13701059062' => 50,
+            '13331043787' => 126,
             '18715313601' => 400
         ];
 

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, $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('app\controller\api\User')->sproductkeywordHistory($uid, $keyword, 3);
+        $repository->sproductkeywordHistory($uid, $keyword, 5);
         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,
-        ]);
-    }
+
 
     /**
      * 签到  获取积分