From 251d97c90173d56e7fa3717f3a3bcebb45fbd5a7 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Thu, 27 Apr 2023 18:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/UserController.php | 5 +++++
 app/Request/UserRequest.php       | 3 +++
 app/Services/UserService.php      | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php
index 1b5d6b4..e13efb7 100644
--- a/app/Controller/UserController.php
+++ b/app/Controller/UserController.php
@@ -156,9 +156,14 @@ class UserController extends AbstractController
     /**
      * 获取弹窗数据
      * @return ResponseInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function getUserPopup(): ResponseInterface
     {
+        $request = $this->container->get(UserRequest::class);
+        $request->scene('getUserPopup')->validateResolved();
+
         $UserService = new UserService();
         $data = $UserService->getUserPopup();
         return $this->response->json($data);
diff --git a/app/Request/UserRequest.php b/app/Request/UserRequest.php
index b8cd5c9..7c1686f 100644
--- a/app/Request/UserRequest.php
+++ b/app/Request/UserRequest.php
@@ -16,6 +16,9 @@ class UserRequest extends FormRequest
         'putUserName' => [ // 修改用户名
             'user_name',
         ],
+        'getUserPopup' => [ // 获取弹窗数据
+            'popup_type',
+        ],
         'addUserAddress' => [ // 添加用户收获地址
             'province_id',
             'city_id',
diff --git a/app/Services/UserService.php b/app/Services/UserService.php
index 258daa7..e2bd755 100644
--- a/app/Services/UserService.php
+++ b/app/Services/UserService.php
@@ -522,6 +522,8 @@ class UserService extends BaseService
     {
         $user_info = $this->request->getAttribute("userInfo") ?? [];
 
+        $popup_type = $this->request->input('popup_type');
+
         if (empty($user_info)){
             // 未登陆
             return success();
@@ -529,6 +531,7 @@ class UserService extends BaseService
 
         $params = array();
         $params['user_id'] = $user_info['user_id'];
+        $params['popup_type'] = $popup_type;
         $popup = Popup::getList($params);
         if (empty($popup)){
             return success();