From 16ef63aac2d4e0cc785f7d11e765e73de4ff7542 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Thu, 12 Sep 2024 17:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AC=E5=9C=B0=E7=94=9F?=
 =?UTF-8?q?=E6=B4=BB=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/LocalStoreGoods.php        |  2 ++
 app/api/logic/LocalStoreGoodsLogic.php        | 19 ++++++++++++++-----
 .../model/localstore/LocalStoreGoodsSpec.php  |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/api/controller/LocalStoreGoods.php b/app/api/controller/LocalStoreGoods.php
index 34e39371..21760a19 100755
--- a/app/api/controller/LocalStoreGoods.php
+++ b/app/api/controller/LocalStoreGoods.php
@@ -9,6 +9,8 @@ use app\common\server\JsonServer;
 
 class LocalStoreGoods extends Api
 {
+    public $like_not_need_login = ['shopDetails'];
+
     // 商品列表
     public function lists()
     {
diff --git a/app/api/logic/LocalStoreGoodsLogic.php b/app/api/logic/LocalStoreGoodsLogic.php
index 91cc5ac1..15ea024c 100644
--- a/app/api/logic/LocalStoreGoodsLogic.php
+++ b/app/api/logic/LocalStoreGoodsLogic.php
@@ -232,13 +232,22 @@ class LocalStoreGoodsLogic extends Logic
                 'goods_id' => $get['id']
             ])->field('id, image, spec_value_ids, spec_value_str, price, stock, note')->select();
 
-            $data['spec'] = LocalStoreGoodsSpec::where([
+            $data['spec'] = LocalStoreGoodsSpec::with('item')->where([
                 'goods_id' => $get['id']
             ])->field('id, name')->select();
-
-            $data['spec_value'] = LocalStoreGoodsSpecValue::where([
-                'goods_id' => $get['id']
-            ])->field('id, spec_id, value')->select();
+            dump($data['spec']);
+            die;
+//            $data['spec_value'] = LocalStoreGoodsSpecValue::where([
+//                'goods_id' => $get['id']
+//            ])->field('id, spec_id, value')->select();
+//
+//            foreach ($data['spec'] as $k1 => &$v1) {
+//                foreach ($data['spec_value'] as $k2 => &$v2) {
+//                    if ($v2['id'] == $v2['spec_id']) {
+//
+//                    }
+//                }
+//            }
         }
 
         if ($data) {
diff --git a/app/common/model/localstore/LocalStoreGoodsSpec.php b/app/common/model/localstore/LocalStoreGoodsSpec.php
index 17e8accb..11ecdc56 100644
--- a/app/common/model/localstore/LocalStoreGoodsSpec.php
+++ b/app/common/model/localstore/LocalStoreGoodsSpec.php
@@ -8,8 +8,8 @@ class LocalStoreGoodsSpec extends Models
 {
     protected $table = 'ls_local_store_goods_spec';
 
-    public function pic()
+    public function item()
     {
-        return $this->hasMany(LocalStoreGoodsPic::class, 'lsg_id');
+        return $this->hasMany(LocalStoreGoodsSpecValue::class, 'spec_id');
     }
 }
\ No newline at end of file