From c903ca5e35d74fbf284f1f83f0ce6f8a3c75998d Mon Sep 17 00:00:00 2001
From: "1215525055@qq.com" <1215525055@qq.com>
Date: Wed, 4 Jun 2025 18:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AE=A1=E6=A0=B8BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/goodsonline/impl/GoodsonlineServiceImpl.java  | 5 +++++
 .../mybatis/mapper/goodsonline/goodsonline-mapper.xml     | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/com/tenlion/aishop/service/goodsonline/impl/GoodsonlineServiceImpl.java b/src/main/java/cn/com/tenlion/aishop/service/goodsonline/impl/GoodsonlineServiceImpl.java
index bb4fd19..fdf69d5 100644
--- a/src/main/java/cn/com/tenlion/aishop/service/goodsonline/impl/GoodsonlineServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/aishop/service/goodsonline/impl/GoodsonlineServiceImpl.java
@@ -57,11 +57,16 @@ public class GoodsonlineServiceImpl extends DefaultBaseService implements IGoods
             params.put("goodsTypes", Arrays.asList(params.get("goodsType").toString().split(",")));
             params.put("goodsType", "");
         }
+        if(params.get("goodsFlags") != null) {
+            params.put("goodsFlags", Arrays.asList(params.get("goodsFlags").toString().split(",")));
+            params.put("goodsFlag", "");
+        }
         List<GoodsSimpleDTO> goodsDTOs = new ArrayList<>();
         if (params.get("goodsFlag") != null && params.get("goodsFlag").toString().equals("置顶")) {
             PageHelper.startPage(1, 1);
             goodsDTOs = goodsonlineDao.listPageAll(page.getParams());
             if(goodsDTOs.size() < 1) {
+                PageHelper.startPage(1, 1);
                 params.put("goodsFlag", "特价");
                 goodsDTOs = goodsonlineDao.listPageAll(page.getParams());
             }
diff --git a/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml b/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml
index 337dfb2..2d499fe 100644
--- a/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml
+++ b/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml
@@ -227,8 +227,14 @@
         <if test="goodsFlag != null and goodsFlag != ''">
             AND t3.goods_flag LIKE  CONCAT('%', #{goodsFlag}, '%')
         </if>
+        <if test="goodsFlags != null and goodsFlags.size > 0">
+            AND
+            <foreach collection="goodsFlags" index="index" open="(" separator=" AND " close=")">
+                t3.goods_flag LIKE CONCAT('%', #{goodsFlags[${index}]}, '%')
+            </foreach>
+        </if>
         <if test="goodsFlagIsNull != null and goodsFlagIsNull != '' ">
-            AND t3.goods_flag = ''
+            AND t3.goods_flag  NOT LIKE  CONCAT('%', '特价', '%')
         </if>
         <if test="notUserId != null and notUserId != ''">
             AND t1.creator != #{notUserId}