From 0e7b852e5185f1300183db828c38a8a92df7fc35 Mon Sep 17 00:00:00 2001
From: youda <youda@Server>
Date: Thu, 24 Apr 2025 13:48:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Goods.php |  2 +-
 app/api/controller/Index.php | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
index 0b5ad87..c171591 100755
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -168,7 +168,7 @@ class Goods extends Base
             ];
             
             // 缓存空结果，避免重复查询
-            $redis->set($cache_key, json_encode($new_data), 300);
+            $redis->set($cache_key, json_encode($new_data), 10);
             
             return $this->renderSuccess('请求成功', $new_data);
         }
diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php
index 6b24fae..c1568e3 100755
--- a/app/api/controller/Index.php
+++ b/app/api/controller/Index.php
@@ -29,10 +29,22 @@ class Index extends Base
         foreach ($advert as &$advert_value) {
             $advert_value['imgurl'] = imageUrl($advert_value['imgurl']);
         }
-        $tuijian = Advert::field('imgurl,ttype,coupon_id,goods_id,url')->where(['type' => 5])->order('sort desc,id desc')->select();
-        foreach ($tuijian as &$advert_value) {
+        $tuijian = Advert::field('id,imgurl,ttype,coupon_id,goods_id,url')->where(['type' => 5])->order('sort desc,id desc')->select();
+        $tuijian_list = [];
+        foreach ($tuijian as $key => &$advert_value) {
             $advert_value['imgurl'] = imageUrl($advert_value['imgurl']);
+            if ($advert_value['goods_id']) {
+                $goods = Goods::where('id', '=', $advert_value['goods_id'])->find();
+                $status = $goods['status'];
+                if (!$goods || $status != 1) {
+                    // 商品不存在或已下架或卖完，不显示此推荐位
+                    // unset($tuijian[$key]);
+                    continue;
+                }
+                $tuijian_list[] = $advert_value;
+            }
         }
+        $tuijian = $tuijian_list;
         #公告
         $notice = Danye::field('title,content')->where(['id' => 3])->find();
         $notice['content'] = contentUrl($notice['content']);

From 5f7abfcf9b1c243eb1406eba276456f31bce0dbd Mon Sep 17 00:00:00 2001
From: youda <youda@Server>
Date: Thu, 24 Apr 2025 23:31:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/Goods/goods_edit.html |  2 +-
 app/api/controller/Config.php        |  2 +-
 app/api/controller/Index.php         | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/admin/view/Goods/goods_edit.html b/app/admin/view/Goods/goods_edit.html
index b39efcb..440ae8c 100755
--- a/app/admin/view/Goods/goods_edit.html
+++ b/app/admin/view/Goods/goods_edit.html
@@ -454,7 +454,7 @@
                     $(".integral_is").hide();
                     $(".show_is").hide();
                     $(".sale_time").hide();
-                    $("#div_daily_xiangou").hide();
+                    $("#div_daily_xiangou").show();
                     
                     $(".rage_is").hide();
                     $(".rage").hide();
diff --git a/app/api/controller/Config.php b/app/api/controller/Config.php
index 98beefa..0694284 100755
--- a/app/api/controller/Config.php
+++ b/app/api/controller/Config.php
@@ -26,7 +26,7 @@ class Config extends Base
         return $this->renderSuccess('获取成功', [
             'good_type' => $goodsTypeList,
             'app_setting' => $app_setting,
-            'version' => '105'
+            'version' => '106'
         ]);
     }
  
diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php
index c1568e3..9293389 100755
--- a/app/api/controller/Index.php
+++ b/app/api/controller/Index.php
@@ -36,11 +36,11 @@ class Index extends Base
             if ($advert_value['goods_id']) {
                 $goods = Goods::where('id', '=', $advert_value['goods_id'])->find();
                 $status = $goods['status'];
-                if (!$goods || $status != 1) {
-                    // 商品不存在或已下架或卖完，不显示此推荐位
-                    // unset($tuijian[$key]);
-                    continue;
-                }
+                // if (!$goods || $status == 2) {
+                //     // 商品不存在或已下架或卖完，不显示此推荐位
+                //     // unset($tuijian[$key]);
+                //     continue;
+                // }
                 $tuijian_list[] = $advert_value;
             }
         }