diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index c1894776..cfd8722f 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -176,4 +176,12 @@ class User extends AdminBaseController
         $result = $service->editUserStage($this->request->param(),$this->getAdminId());
         return json($result);
     }
+
+    // 获取用户收藏(自选)股票列表
+    public function userMarketList()
+    {
+        $service = new UserService();
+        $result = $service->userMarketList($this->request->param());
+        return json($result);
+    }
 }
diff --git a/app/admin/route/app.php b/app/admin/route/app.php
index 59254613..77e68013 100644
--- a/app/admin/route/app.php
+++ b/app/admin/route/app.php
@@ -14,7 +14,7 @@ $header = [
 //Route::get('/test', 'Test/index');
 Route::post('/test', 'Test/index');
 Route::post('/test_upload', 'Upload/uploadVideo');
-Route::post('test_api', 'Agent/customerUserList');
+Route::post('test_api', 'User/userMarketList');
 Route::group('/', function () {
     // 上传图片
     Route::post('/upload', 'Upload/upload');
@@ -204,6 +204,7 @@ Route::group('/', function () {
     Route::post('user/edit_password', 'User/editPassword')->middleware('admin_log');
     Route::post('user/frozen', 'User/frozen'); //用户充值、提款封禁与解封
     Route::post('user/edit_user_stage', 'User/editUserStage'); //编辑用户阶段信息
+    Route::post('user/user_market_list', 'User/userMarketList'); // 获取用户收藏(自选)股票列表
 
     //送股
     Route::post('/user/give_stock', 'setting.GiveStock/add')->middleware('admin_log');
diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php
index a1b8440e..dbd0b573 100644
--- a/app/admin/service/UserService.php
+++ b/app/admin/service/UserService.php
@@ -19,6 +19,7 @@ use app\model\UserDigitalModel;
 use app\model\UserForexModel;
 use app\model\UserLoanModel;
 use app\model\UserLoginLog;
+use app\model\UserMarketModel;
 use app\model\UserModel;
 use app\model\UserStageStateModel;
 use app\model\UserStockBrlModel;
@@ -1404,6 +1405,40 @@ class UserService extends AdminBaseService
             return $this->toData('500', '系统异常 请稍后重试', [$exception->getMessage(), $exception->getTrace()]);
         }
     }
+
+    // 用户收藏的股票(自选股票)
+    public function userMarketList($param)
+    {
+        try {
+            if (empty($param['page']) || !is_numeric($param['page'])) {
+                return $this->toData('400', '参错错误');
+            }
+            if (empty($param['limit']) || !is_numeric($param['limit'])) {
+                return $this->toData('400', '参错错误');
+            }
+            $where = [];
+            if (!empty($param['user_id'])) {
+                $where['user_id'] = $param['user_id'];
+            }
+            if (!empty($param['market_type'])) {
+                $where['market_type'] = $param['market_type'];
+            }
+
+            $list = UserMarketModel::where($where)->order('id', 'desc')->paginate([
+                'list_rows' => $param['limit'],
+                'page' => $param['page'],
+            ]);
+            return $this->toData('0', 'Successful', [
+                'list' => $list->items(), // 当前页的数据
+                'page' => $list->currentPage(), // 当前页码
+                'total' => $list->total(), // 总记录数
+                'last_page' => $list->lastPage(), // 最后一页页码
+            ]);
+        } catch (\Exception $e) {
+            return $this->toData('500', '系统异常 请稍后重试', [$e->getMessage(), $e->getTrace()]);
+        }
+    }
+
 }