From f26a27fec50c48f04178606c32365c0168b3be16 Mon Sep 17 00:00:00 2001
From: limu <limu@163.com>
Date: Fri, 26 Jan 2024 12:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/User.php       |  2 +-
 app/api/service/Feedback.php      | 10 +++++-----
 app/api/service/Store.php         |  2 +-
 app/common/model/UserFeedback.php |  7 ++++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/api/controller/User.php b/app/api/controller/User.php
index fa2bb12a..852ea49d 100644
--- a/app/api/controller/User.php
+++ b/app/api/controller/User.php
@@ -106,7 +106,7 @@ class User extends Controller
         // 当前用户信息
         $userInfo = UserService::getCurrentLoginUser(true);
         $params = $this->request->param();
-        if (empty($params['content']) || (empty($params['store_id']) && $params['object_type'] != 1) || empty($params['type'])) {
+        if (empty($params['content']) || (empty($params['shop_id']) && $params['object_type'] != 1) || empty($params['type'])) {
             return $this->renderError('请补全信息');
         }
         $userData = [
diff --git a/app/api/service/Feedback.php b/app/api/service/Feedback.php
index ee2cc0c8..9a3208b7 100644
--- a/app/api/service/Feedback.php
+++ b/app/api/service/Feedback.php
@@ -28,7 +28,7 @@ class Feedback extends BaseService
     {
         $addData = [
             'user_id' => $user_data['user_id'],
-            'store_id' => $data['store_id'] ?? 0,
+            'shop_id' => $data['shop_id'] ?? 0,
             'type' => $data['type'],
             'object_type' => $data['object_type'],
             'content' => $data['content'],
@@ -36,6 +36,7 @@ class Feedback extends BaseService
             'mobile' => $user_data['mobile'],
             'status' => 0,
             'created_at' => time(),
+            'shop_id' => $this->storeId,
         ];
         $model = new UserFeedback();
         return $model->insert($addData);
@@ -48,12 +49,11 @@ class Feedback extends BaseService
         if (!empty($params['is_my']) && !empty($params['user_id'])) {
             $query = $query->where(['user_id' => $params['user_id']]);
         }
-        $list = $query->with(['store'])
-            ->order('replay_at desc,created_at desc')
+        $list = $query->with(['shop'])
             ->paginate($listRows)->toArray();
         foreach ($list['data'] as $k => $v) {
-            $list['data'][$k]['store_name'] = !empty($v['store']['store_name']) ? $v['store']['store_name'] : '';
-            unset($list['data'][$k]['store']);
+            $list['data'][$k]['shop_name'] = !empty($v['shop']['shop_name']) ? $v['shop']['shop_name'] : '';
+            unset($list['data'][$k]['shop']);
         }
         return $list;
     }
diff --git a/app/api/service/Store.php b/app/api/service/Store.php
index 5690bebc..d67c3f5e 100644
--- a/app/api/service/Store.php
+++ b/app/api/service/Store.php
@@ -186,7 +186,7 @@ class Store extends BaseService
 
     public function getStore()
     {
-        $storeList = Db::query('select store_id,store_name from yoshop_store where status = 1  and is_recycle = 0 and is_delete= 0');
+        $storeList = Db::query('select shop_id,shop_name from yoshop_store_shop where status = 1  and is_delete= 0');
         return $storeList;
     }
 
diff --git a/app/common/model/UserFeedback.php b/app/common/model/UserFeedback.php
index c0a25075..e681b706 100644
--- a/app/common/model/UserFeedback.php
+++ b/app/common/model/UserFeedback.php
@@ -14,6 +14,7 @@ namespace app\common\model;
 
 use cores\BaseModel;
 use think\model\relation\HasOne;
+use app\common\model\store\Shop;
 /**
  * 用户模型类
  * Class User
@@ -38,12 +39,12 @@ class UserFeedback extends BaseModel
     }
 
     /**
-     * 关联商家
+     * 关联门店
      * @return HasOne
      */
-    public function store(): HasOne
+    public function shop(): HasOne
     {
-        return $this->hasOne('store', 'store_id', 'store_id');
+        return $this->hasOne(Shop::class, 'shop_id', 'shop_id');
     }
 
 }