From f593e1850bfd7f15f8fb2b11bb84e7722ea5f0f2 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Fri, 12 Dec 2025 16:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/Post.php          | 2 +-
 app/common/service/PostService.php | 3 ++-
 app/common/service/UserService.php | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/common/model/Post.php b/app/common/model/Post.php
index a5a6fe6..37997ab 100644
--- a/app/common/model/Post.php
+++ b/app/common/model/Post.php
@@ -40,7 +40,7 @@ class Post extends Model
     /**
      * 允许自动填充模型字段
      */
-    protected $fillable = ['id', 'user_id', 'category_id', 'sku_id', 'content', 'location_name', 'latitude', 'longitude', 'status', 'sort', 'like', 'favorite', 'comment', 'browse', 'created_at', 'updated_at', 'price', 'age'];
+    protected $fillable = ['id', 'user_id', 'category_id', 'sku_id', 'content', 'shop_name', 'location_name', 'latitude', 'longitude', 'status', 'sort', 'like', 'favorite', 'comment', 'browse', 'created_at', 'updated_at', 'price', 'age'];
 
     /**
      * 不允许自动填充模型字段
diff --git a/app/common/service/PostService.php b/app/common/service/PostService.php
index ff05702..c76c8b7 100644
--- a/app/common/service/PostService.php
+++ b/app/common/service/PostService.php
@@ -119,7 +119,8 @@ class PostService
         }
         $data['latitude'] = $user->latitude;
         $data['longitude'] = $user->longitude;
-        $data['location_name'] = $user->shop_name;
+        $data['location_name'] = $user->location_name;
+        $data['shop_name'] = $user->shop_name;
         $media = serialize($data['media']);
         redis::set('PostMedia_'.$data['user_id'],$media,30);
         unset($data['media']);
diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php
index 5f87e1d..134ff29 100644
--- a/app/common/service/UserService.php
+++ b/app/common/service/UserService.php
@@ -108,6 +108,7 @@ class UserService
                 'longitude' => $user->longitude,
                 'latitude' => $user->latitude,
                 'shop_name' => $user->shop_name,
+                'location_name' => $user->location_name,
             ],
         ];
     }
@@ -183,7 +184,7 @@ class UserService
     {
         // 对密码进行哈希处理
         $user = User::find($uid);
-        $keysToKeep = ['name', 'nickname', 'avatar', 'mobile',  'latitude', 'longitude', 'shop_name'];
+        $keysToKeep = ['name', 'nickname', 'avatar', 'mobile',  'latitude', 'longitude', 'shop_name', 'location_name'];
 
         $data = array_intersect_key($data, array_flip($keysToKeep));