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 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 @@ AND t3.goods_flag LIKE CONCAT('%', #{goodsFlag}, '%') + + AND + + t3.goods_flag LIKE CONCAT('%', #{goodsFlags[${index}]}, '%') + + - AND t3.goods_flag = '' + AND t3.goods_flag NOT LIKE CONCAT('%', '特价', '%') AND t1.creator != #{notUserId}